Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 16826) +++ /applications/editors/josm/i18n/po/ar.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:15+0000\n" -"Last-Translator: AtomCell \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-03 16:57+0000\n" +"Last-Translator: Zargonovski \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" @@ -17,81 +17,161 @@ "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-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "جاري إنشاء واجهة المستخجم الرسومية الرئيسية" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "خطأ" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "التغييرات غير المحفوظة" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "حفظ و خروج" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "تجاهل و خروج" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -100,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "إلغاء" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "التحذير" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "تجاهل عنوان الملف المشوه : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "مجهول" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "معلومات حول" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "أعرض شاشة المعلومات حول." @@ -133,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -144,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -151,19 +291,19 @@ msgstr "الإصدار {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "آخر تغيير في {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "إصدارجافا {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "صفحة الإنترنت" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "تقارير عن أخطاء" @@ -173,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "معلومات" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "نص للقراءة" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "مراجعة" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "المشاركة" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "الرخصة" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "إضافات" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "حول JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "لا يمكن العثور عن الملف" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -212,16 +356,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "التحذير" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -230,7 +367,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "الرجاء إختيار على الأقل طريق واحدة." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "إختر أي من :" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "إدمج العقد" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "أضف عقدة..." @@ -242,14 +407,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -257,57 +424,57 @@ msgstr "حرّر : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "أدخل الأحداثيات للعقدة الجديدة." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "إستعمل الدرجات العشرية." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "خط العرض" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "خط الطول" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "نظم العقد على حلقة" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "حرّك العقد المحددة إلى الحلقة" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -323,25 +490,58 @@ msgstr "العدة: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "الرجاء إختيار أربعة عقد على الأقل." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "المعلومات" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "صفّ العقد في خطّ مستقيم" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "حرك العقد المختارة إلى خط" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "الرجاء إختيار على الأقل ثلاثة عقد." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -350,18 +550,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -370,5 +562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -377,46 +569,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "الطبقة" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "الخيار" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "التناقض" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "نزّل" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "زوم الى {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "كبّر/صغّر الرؤية إلى {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -426,30 +618,30 @@ msgstr "أعرض: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "لا يوجد شيء محدد للتكبير/للتصغير." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "لا تناقضات للتكبير عليها" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "ادمج الطريق" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "ادمج عدة طرق في طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -457,13 +649,13 @@ msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "على أي حال ادمج" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "غيّر الإتجاه ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -471,10 +663,10 @@ msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "أعكس ثم إدمج" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -482,20 +674,20 @@ msgstr "ادخل القيم لكل التناقضات." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "حلل التناقضات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "كل الطرقات كانت فارغة" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -512,23 +704,24 @@ msgstr "نسخ الكائنات المختارة الى وسيط الصق" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "الرجاء إختيار شيء للنسخ." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "إنشاء حلقة" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "كوّن مستديرة من ثلاث عقد مختارة." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "هذه العقد ليست في مستديرة." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -536,87 +729,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "أحذف" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "امحي الأغراض المختارة." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "الكتابة فوقه" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "الملف موجود. الكتابة عليه ؟" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "وزّع العقد" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "وزع العقد المختارة على مسافاة متساوية على طول خط." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "نزّل من أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "الملف : {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "نزّل" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "أخطاء عند التنزيل" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "نسخة مطابقة" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -636,5 +864,5 @@ msgstr "أخرُج من التطبيق." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -642,58 +870,73 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "صدّر إلى GPX ..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "صدّر المعطيات إلى ملف GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "لا شيء للتصدير. إحصل على بعض المعطيات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "وصف أثر جهاز تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "أضف معلومات عن المؤلف" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "الإسم الحقيقي" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "حقوق المؤلف (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "مسبق التعريف" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "تاريخ حقوق المؤلف" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "كلمات البحث" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "خيارات التصدير" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "صدّر ثم إحفظ" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -704,25 +947,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "خطأ" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "إختر رخصة معرفة سابقاً" @@ -732,46 +955,49 @@ msgstr "المساعدة على الخط لِـ ج.أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "إفتح في المتصفح" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "حرّر" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "أعد التحميل" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "خطء عند تحميل الصفحة {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -807,30 +1033,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "ضمّ العقدة و الخط" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "لا إختصار" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "ادمجعلى كلّ حال" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "إحفظ المعطيات الحالية في ملف جديد." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "إدمج العقد" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "الرجاء إختيار على الأقل عقدتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "دمج العقد رغم عضويتها المختلفة ؟" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -838,68 +1074,79 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "ادمجعلى كلّ حال" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "إدمج {0} عقد" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "الخيار" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "إلى أعلى" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "حرّك الأغراض {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "إلى أسفل" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "إلى اليسار" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "إلى اليمين" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "حرذك {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "حرّك الأغراض {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا" @@ -907,5 +1154,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "جديد" @@ -915,26 +1162,17 @@ msgstr "أنشئ خريطة جديدة." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "غيرمسمى" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "إفتح..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "إفتح ملف." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "لم أتمكن من قراءة \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -963,41 +1201,41 @@ msgstr "URL التنزيل" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "مسموح فقط عقدتين" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "يجب أن يتكون الخيار من طرقات فقط." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "عقدة واحدة محددة فقط" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "إسقاط عمودي" @@ -1013,11 +1251,11 @@ 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:78 +msgid "Paste Tags" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1045,16 +1283,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "غيّر إسم الطبقة" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "و غير إسم الملف" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "لم أتمكن من إعادة تسمية الملف \"{0}\"." @@ -1068,9 +1311,9 @@ msgstr "أعكس إتجاه كل الطرقات المختارة." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "الرجاء إختيار على الأقل طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "أعكس إتجاه الطرقات" @@ -1078,17 +1321,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "إحفَظ" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "إحفظ المعطيات الحالية." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1096,25 +1341,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "مستند فارغ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "لا يحتوي المستند على أي معطيات." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "رغم ذلك احفظه" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "التناقضات" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1122,54 +1367,75 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "إحفظ ملف أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "إحفظ ملف GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" +msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "إمتداد الملف غير معروف: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "حصل خطأ عند الحفظ." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "إمتداد ملف غير معروف." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "حصل خطأ عند الحفظ." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "إحفظ كــ ..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "إحفظ المعطيات الحالية في ملف جديد." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "إختر الكلّ" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1200,16 +1466,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "اغلق" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "" @@ -1219,5 +1485,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1229,5 +1495,5 @@ msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1239,9 +1505,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1249,10 +1515,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1260,17 +1526,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1291,56 +1557,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "إختر أي من :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1350,9 +1616,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1360,5 +1626,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1374,139 +1640,89 @@ msgstr "إلغاء التصرف الأخير." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "إلغاء إختيار الكلّ" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "إلغاء إختيار كلّ الأغراض." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "تحديث المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "حمّل إلى أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "الأغراض اللتي يجب إضافتها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "الأغراض اللتي يجب تغييرها:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "الأغراض اللتي يجب حذفها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "حمّل هذه التغييرات :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "حمّل التغييرات" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1520,17 +1736,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1541,53 +1757,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "أخبار اليوم غير متوفرة" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "جاري تنزيل \"أخبار اليوم\"" @@ -2973,62 +3364,57 @@ msgstr "كلمة‌المرور" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "الإستعمال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "الخيارات" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "أعرض هذه المساعدة" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "عيّن اللغة" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "أمثال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3036,51 +3422,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3088,21 +3474,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "أعرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "أقلب عرض الأسلاك" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "أقلب عرض ملء الشاشة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "سمعيّ" @@ -3146,53 +3532,68 @@ msgstr "المقياس" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "خطّ الطول عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "إسم الغرض عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "خطّ العرض عند مؤشر الفأرة." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(لا يوجد أي غرض)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "الطبقة ليست في اللائحة." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "جاري الإتصال بلخادم أو.أس.أم ..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "لم يُعثر على الملف" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3214,4 +3615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "جاري التهيئة" @@ -3243,20 +3645,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3264,47 +3666,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3312,25 +3714,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3367,5 +3769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3376,5 +3778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3388,5 +3790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3461,7 +3863,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3535,14 +3936,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3571,10 +3972,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3583,19 +3984,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3604,9 +4005,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3616,13 +4017,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3630,90 +4031,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "تم حذفه" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3723,5 +4124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3746,12 +4147,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3796,10 +4196,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3808,10 +4208,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3820,5 +4220,5 @@ msgstr "القيمة" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3878,9 +4278,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3888,5 +4288,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3916,42 +4316,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "رغم ذلك احفظه" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, 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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "حلّ التناقضات" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3969,96 +4386,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "الطبقات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "إفتح لائحة بكلّ التبقات المحملة." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "أمحي الطبقة المختارة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "هناك تغييرات غير محفوظة.رغم ذالك أمحي الطبقة ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "أمحي الطبقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "هل تريد فعلاً محو كلّ الطبقة ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "المعلومات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "ش." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "أحذف" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "أمحي {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "عرض/إخفاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "أعرض/أخفي النص/الأيقونات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "الطبقات" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "إفتح لائحة بكلّ التبقات المحملة." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "خامل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "أمحي الطبقة المختارة." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +msgid "Merge this layer into another layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "الطبقات: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "لوحة معلومات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4067,22 +4516,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "قيمة فارغة ستمحي المفتاح." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<مختلف>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "غيّر القيم ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4091,84 +4546,89 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "الرجاء إختيار مفتاح" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "الرجاء إختيار قيمة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "خصائص/عضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "خصائص الأغراض المختارة." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "عضو من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "غيّر العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "أضف صفة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "أضِف" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "حرّر الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "حرّر المحتاح المنقى لكلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "أمحي الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "الخصائص: {0} / العضويات: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "الخصائص/ العضويات" @@ -4177,63 +4637,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "العلاقات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "إفتح لائحة بكل العلاقات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "العلاقات: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "إفتح محرر نص للعلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "أمحي العلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "أنشئ علاقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "العلاقات: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "إفتح محرر نص للعلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "أمحي العلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "الخيار الحالي" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "إفتح نافذة لائحة خيارات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "إنعاش لائحة الخيارات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "الخيار" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4246,5 +4708,5 @@ msgstr[5] "{0} طريق" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4253,5 +4715,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4262,148 +4724,418 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "المؤلفين" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "إفتح لائحة بإسم الأشخاص اللذين يعملون على الأغراض المختارة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "المؤلف" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "رقم الغرض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "المؤلفون: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "نزّل المساحة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "أمحي العلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "موقع التنزيل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "العلاقات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "جاري تحميل المعطيات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "العلاقات" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "أمحي العلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "أمحي العلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "علاقة متناقضة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "إحفظ المعطيات الحالية." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "مُوافق" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "نزّل الأعضاء" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "صغّر الرؤية" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "طبّق التغيرات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "الأساسي" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "المشغول من" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "حرّك إلى الأعلى" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "أضف الإختيار" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "أزل المختارة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "حرّك إلى الأسفل" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "نزّل الأعضاء" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "محرّر العلاقات: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "حمّل الخيار" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4413,5 +5145,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4421,25 +5153,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "إشارات مرجعية" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "الرجاء إدخال إسم للموقع." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "أضف إلى اخيار" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "إختر أولاً إشارة مرجعية" @@ -4472,34 +5201,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "مصادر المعطيات و نوعيتها" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "نزّل كطبقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "نزّل المساحة" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "المساحة المطلوبة ضخمة جداً، إحتمال أن ترفض من قبل الخادم" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "الرجاء إدخال مصطلحات البحث" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم" @@ -4507,5 +5236,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "أدخل إسم المكان للبحث عنه:" @@ -4513,5 +5242,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4519,6 +5248,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "الإسم" @@ -4557,6 +5286,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4579,15 +5308,15 @@ msgstr "النوع" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "قرب" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "تكبير/تصغير" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4596,5 +5325,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "خريطة زالقة" @@ -4626,5 +5355,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5366,5 +6101,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5531,59 +6266,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "الصول لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "إقرءGPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "لا توقيت للنقطة {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "جاري قراءة {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "الإنحراف الحالي: {0}ث" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "إختلاف في التوقيت الجغرافي: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5595,138 +6330,128 @@ msgstr[5] "صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} من ضمن المسلك." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "صور (*.jpg)JPEG" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "الصورة" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "نقطة gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "إستعمل الإعدادات العامة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "أرسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "حدد خيارات رسم الخطوط" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "خصّص اللون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "مُوافق" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "الغيابي" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "إختر لون" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "إستورد صوت مسجل" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "ملفات صوتيت (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "العلامات الصوتية من {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "إستورد صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5735,5 +6460,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5742,5 +6467,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5749,30 +6474,30 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "الإسم: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "الوصف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "الفترة الزمنية " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "الطول: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5782,43 +6507,43 @@ "مضرة.
أنظر هنا إذا أردت تحميل بعض الأثرات:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "محوّل من: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} أمتار" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} كلم²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5827,9 +6552,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5837,5 +6562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5843,47 +6568,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} ممحي.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5912,5 +6637,5 @@ msgstr[5] "مسالك" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5922,5 +6647,5 @@ msgstr[5] "نقاط" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5929,5 +6654,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5936,5 +6661,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5961,5 +6686,5 @@ msgstr[5] "دالات" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5968,29 +6693,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "مزامنة الصوت" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "تمّت مزامنة الصوت على النقطة {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5998,10 +6723,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "أعرض/أخفي النص/الأيقونات" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6009,5 +6741,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6015,29 +6747,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "غير قادر على إنشاء دالة صوتيت جديدة." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "التفضيلات المتقدمة" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6045,26 +6777,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "القيمة الحالية هي الغيابية." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "القيمة الغيابية هي ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "القيمة الغيابية غير معروفة حالياً (لم يتم بعد التعيين)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6072,14 +6804,14 @@ msgstr "القيمة الجديدة لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "أدخل زوج جديد مفتاح/قيمة" @@ -6202,40 +6934,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "اللون" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "نوع الطلاء {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "الطبقة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "إختر" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "الرجاء إختيار اللون لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "الألوان" @@ -6564,46 +7296,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "لائحة التنزيل." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "حدّث" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "الرجاء إختيار خانة." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "وصف الرمز" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "إعدادات المعراض" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6611,29 +7352,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "إعدادات الاتصال" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "تعيينات الإتصال للخادم أو.أس.أم." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "إعدادات الخريطة" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "إعدادت إسقاط الخريطة و تفسير المعطيات." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "تعيينات الصوت" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6735,59 +7476,61 @@ msgstr "الإختصار" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6953,33 +7696,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "مزيد من المعلومات عن هذه الميزة" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "ميزات خيارية:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "طريق مغلقة الدوران" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6990,15 +7733,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7012,18 +7755,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -7034,33 +7777,36 @@ msgstr "المجموعة المسبقة التعريف ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "جاري الإتصال بلخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "جاري تحميل النقاط {0} إلى {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "جاري تنزيل معطيات أو.أس.أم" - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "جاري تحضير المعطيات..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "لم أتمكن من قراءة \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7068,21 +7814,21 @@ msgstr "ملفات GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7098,10 +7844,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "جاري تنزيل معطيات أو.أس.أم" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7109,48 +7874,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "ملفات NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "الإحداثيات المستوردة: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "جمل غير صحيحة التكوين: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "" -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "جُمل غير معروفة: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "إحداثيات 0 " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "نجاح إسيراد NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "فشل إستيراد NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7159,15 +7923,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7175,23 +7939,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "جاري الإرسال..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "نوع الطلاء {0}:{1}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7234,9 +8011,4 @@ msgid "Login" msgstr "دخول" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "إجهاض..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7287,66 +8059,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "خطأ تحليل نحوي" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "ملفات الخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "نسخة مجهولة" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "لا يوجد لــ أي مرجع" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "غرض غير مسموح به معروف بــ id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7354,51 +8130,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "حضّر المعطيات أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "ضذوذ تكوين معرف العقدة" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "جاري الإتصال بلخادم" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} باقية. متابعة الإرسال لِــ {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7407,16 +8216,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} باقية. متابعة الإرسال لِــ {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7430,5 +8234,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7437,23 +8241,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7464,32 +8268,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, 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 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7497,21 +8299,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7519,5 +8321,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7525,19 +8327,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7545,25 +8347,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" msgstr "المعلومات" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "لا يوجدأي وصف" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7572,13 +8372,18 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7588,9 +8393,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7600,57 +8405,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "مجهول" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: الإصدار {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "يتم ذلك بعد الإنتهاء من التسجيل" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "خطأ تشغيل صوت" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "لا تفعل أي شيء" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "بلّغ عن علّة" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7660,18 +8443,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "الشذوذ غيرال متوقع" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7679,17 +8462,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "تأكد من ضمّ المعلومات التالية:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "لا تظهر مرة اخرى" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7699,5 +8498,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7707,5 +8506,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7716,13 +8515,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(تلميحة: يمكنك تحرير المختصرات في التفضيلات)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7730,21 +8544,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7752,74 +8566,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "تمّ إلغاء التحميل" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "لم يتم إعطاء إسم للمؤلف" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7885,33 +8700,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7931,15 +8747,15 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "خطء عند تحليل {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7948,34 +8764,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7983,69 +8799,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8054,9 +8870,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8065,65 +8881,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8131,13 +8947,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8159,5 +8975,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -8180,6 +8996,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8343,22 +9159,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8366,18 +9182,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8490,6 +9306,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "" @@ -8518,5 +9334,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8525,14 +9341,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "خطء في صيغة المعطيات" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "" @@ -8620,4 +9436,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "لم يتم تحميل أي معطيات." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8628,9 +9449,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8751,30 +9572,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8783,14 +9604,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -8881,40 +9702,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "جاري البحث عن خط الشاطئ" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "خطء حين إنشاء مجلد الخابية: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "جاري فحص الخابية..." @@ -8923,26 +9744,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9027,7 +9840,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "الماء" @@ -9172,9 +9985,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9414,18 +10227,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9450,33 +10263,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "غيّر الخيار" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "التحم عن بعد" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9485,28 +10298,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "الأفعال المسموح بها" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "هل تريد السماح بذلك ؟" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9770,4 +10583,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10014,33 +10848,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10072,6 +10906,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10081,10 +10915,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10171,22 +11005,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." msgstr "" @@ -10258,22 +11084,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10346,23 +11172,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10371,7 +11197,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10379,78 +11205,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10458,82 +11286,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10678,7 +11506,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "" @@ -10692,5 +11520,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10724,10 +11552,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10781,7 +11609,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10793,10 +11645,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10845,14 +11697,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10863,26 +11715,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10890,5 +11742,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10898,5 +11750,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10905,107 +11757,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11110,11 +11962,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11124,10 +11981,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11135,5 +11992,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11143,5 +12000,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11151,15 +12008,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11167,5 +12024,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11173,5 +12030,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11180,15 +12037,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11197,10 +12054,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11209,15 +12066,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11227,10 +12084,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11239,5 +12096,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11246,5 +12103,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11252,11 +12109,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12411,58 +13275,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12476,6 +13288,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12501,6 +13313,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12526,6 +13338,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12551,6 +13363,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12564,5 +13376,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12580,5 +13392,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12612,6 +13424,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12638,6 +13450,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12687,5 +13499,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "" @@ -13664,5 +14476,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15393,27 +16205,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "الرياضة" @@ -18252,7 +19064,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18322,7 +19134,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18348,5 +19160,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -18837,13 +19649,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "مهجور" @@ -18885,5 +19697,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "خيل" @@ -19103,4 +19915,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "رياضة المحركات" + #. color tertiary #. @@ -19135,6 +20009,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "شارع" @@ -19190,7 +20064,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19246,8 +20120,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "سكة حديد" @@ -19268,5 +20142,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19280,5 +20154,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19299,5 +20173,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "مستديرة دوران" @@ -19312,5 +20186,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19325,5 +20199,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "شاطئ نهر" @@ -19337,5 +20211,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "جدول نهر" @@ -19349,5 +20223,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "حوض سفن" @@ -19375,5 +20249,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "قنة جر" @@ -19541,13 +20415,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "من صنع الإنسان" @@ -19609,7 +20483,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19632,10 +20506,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19671,7 +20545,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "سكة حديد قديمة" @@ -19716,6 +20590,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19729,5 +20603,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19749,5 +20623,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19761,5 +20635,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19807,7 +20681,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "خط جوي" @@ -19824,5 +20698,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19837,5 +20711,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19850,5 +20724,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19863,5 +20737,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19876,5 +20750,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19889,5 +20763,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -19992,10 +20866,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "طاقة" @@ -20009,5 +20883,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "رصيف ميناء" @@ -20021,5 +20895,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "خط أنابيب" @@ -20147,12 +21021,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "وقت الفراغ" @@ -20166,5 +21040,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "مارينا" @@ -20236,8 +21110,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20339,10 +21213,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20728,22 +21602,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20775,6 +21649,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20835,8 +21709,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "صحة" @@ -21189,26 +22063,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "متجر/دكان" @@ -21280,8 +22154,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "فندق" @@ -21431,9 +22305,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "سياحة" @@ -21505,8 +22379,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "تاريخي" @@ -21577,8 +22451,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "خضار" @@ -21592,5 +22466,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "كسارة / مقلع حجارة" @@ -21604,5 +22478,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21624,5 +22498,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "حوض" @@ -21636,5 +22510,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "غابة" @@ -21648,5 +22522,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "فناء مزرعة" @@ -21669,5 +22543,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "بيع بلمفرق" @@ -21681,5 +22555,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "صناعي" @@ -21693,5 +22567,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21705,5 +22579,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "حقل خضار" @@ -21717,5 +22591,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21772,7 +22646,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "عسكري" @@ -21786,5 +22660,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "مقبرة/جبانة" @@ -21797,5 +22671,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "قمّة" @@ -21810,5 +22684,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "نهر الجليد" @@ -21822,5 +22696,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "بركان" @@ -21875,8 +22749,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "طبيعي" @@ -21890,5 +22764,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "أشجار منخفضة" @@ -21902,5 +22776,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "أرض بور" @@ -21914,5 +22788,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "غابة/حرش" @@ -21926,5 +22800,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "طين" @@ -21938,5 +22812,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "شاطئ" @@ -22014,8 +22888,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "طريق" @@ -22063,7 +22937,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "الحدود" @@ -22205,10 +23079,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "المكان" @@ -22256,6 +23130,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "العنوان" @@ -22552,72 +23426,36 @@ msgstr "" +#~ msgid "Layers: {0}" +#~ msgstr "الطبقات: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة" + +#~ msgid "Aborting..." +#~ msgstr "إجهاض..." + +#~ msgid "false" +#~ msgstr "خاطئ" + +#~ msgid "true" +#~ msgstr "حقيقي" + +#~ msgid "different" +#~ msgstr "مختلف" + +#~ msgid "Rotate" +#~ msgstr "أدر" + +#~ msgid "Change" +#~ msgstr "غيّر" + +#~ msgid "unnamed" +#~ msgstr "غيرمسمى" + +#~ msgid "Email" +#~ msgstr "البريد الإلكتروني" + #~ msgid "Data Layer" #~ msgstr "طبقة المعطيات" - -#~ msgid "Uploading data" -#~ msgstr "جاري تحميل التغييرات" - -#~ msgid "Not implemented yet." -#~ msgstr "لمّا مفعّل." - -#~ msgid "Email" -#~ msgstr "البريد الإلكتروني" - -#~ msgid "Resolve Conflicts" -#~ msgstr "حلّ التناقضات" - -#~ msgid "There were conflicts during import." -#~ msgstr "حصل تعارض حين الإستيراد." - -#~ msgid "Object" -#~ msgstr "الغرض" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم." - -#~ msgid "OSM username (email)" -#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)" - -#~ msgid "Unknown host" -#~ msgstr "مضيف غير معروف" - -#~ msgid "position" -#~ msgstr "المكان" - -#~ msgid "different" -#~ msgstr "مختلف" - -#~ msgid "true" -#~ msgstr "حقيقي" - -#~ msgid "false" -#~ msgstr "خاطئ" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "حلّ {0} التناقضات في {1} أغراض" - -#~ msgid "Change" -#~ msgstr "غيّر" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة" - -#~ msgid "Revert" -#~ msgstr "إسترجع" - -#~ msgid "Date" -#~ msgstr "التاريخ" - -#~ msgid "Rotate" -#~ msgstr "أدر" - -#~ msgid "Error parsing server response." -#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." - -#~ msgid "Cannot connect to server." -#~ msgstr "غير قادر على الإتصال بلمخدم." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" #~ msgid "" @@ -22630,12 +23468,69 @@ #~ msgstr "أودع الملاحظات" -#~ msgid "Charge" -#~ msgstr "رسم الدخول / الإستعمال" +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):" + +#~ msgid "Basic" +#~ msgstr "الأساسي" + +#~ msgid "Add Selected" +#~ msgstr "أضف الإختيار" + +#~ msgid "Date" +#~ msgstr "التاريخ" + +#~ msgid "Object" +#~ msgstr "الغرض" + +#~ msgid "Cannot connect to server." +#~ msgstr "غير قادر على الإتصال بلمخدم." + +#~ msgid "Not implemented yet." +#~ msgstr "لمّا مفعّل." + +#~ msgid "Occupied By" +#~ msgstr "المشغول من" + +#~ msgid "Remove Selected" +#~ msgstr "أزل المختارة" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة" + +#~ msgid "Revert" +#~ msgstr "إسترجع" + +#~ msgid "Error parsing server response." +#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." + +#~ msgid "Conflicts: {0}" +#~ msgstr "التناقضات: {0}" #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):" +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" + +#~ msgid "There were conflicts during import." +#~ msgstr "حصل تعارض حين الإستيراد." + +#~ msgid "Move Down" +#~ msgstr "حرّك إلى الأسفل" + +#~ msgid "Move Up" +#~ msgstr "حرّك إلى الأعلى" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "محرّر العلاقات: {0}" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "حلّ {0} التناقضات في {1} أغراض" + +#~ msgid "position" +#~ msgstr "المكان" #~ msgid "Some of the nodes are (almost) in the line" @@ -22645,7 +23540,4 @@ #~ msgstr "Oberpfalz Geofabrik.de" -#~ msgid "Conflicts: {0}" -#~ msgstr "التناقضات: {0}" - #~ msgid "viaduct" #~ msgstr "جسر" @@ -22653,7 +23545,4 @@ #~ msgid "sports" #~ msgstr "مبيع لوازم للأنشطة رياضية" - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "حصلت الأخطاء التالية عند التنزيل الضخم:" #~ msgid "Helppage missing. Create it in english." @@ -22667,4 +23556,16 @@ #~ "HREF=\"{1}\">بِلغتك." +#~ msgid "Contacting the OSM server..." +#~ msgstr "جاري الإتصال بلخادم أو.أس.أم ..." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم." + +#~ msgid "OSM username (email)" +#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)" + #~ msgid "Directly load TCX files from JOSM." #~ msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم." + +#~ msgid "Charge" +#~ msgstr "رسم الدخول / الإستعمال" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 16826) +++ /applications/editors/josm/i18n/po/bg.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-06-27 16:00+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-03 15:39+0000\n" +"Last-Translator: pl71 \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,81 +16,162 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Създаване на интерфейса" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +"Проекцията {0} не може да бъде активирана. Използва се меркаторна проекция." + +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Грешка" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Незаписани промени" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Има несъхранени промени. Да ги отхвърлим ли за да продължим?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Запис и Изход" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Откажи промените и Изход" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Отмяна" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Внимание" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнориране неправилен адрес на файл: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "За програмата" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Покажи екран с информация за програмата." @@ -132,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +291,19 @@ msgstr "Версия {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Последни промени: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Версия Java: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Домашна страница" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Съобщаване на грешки" @@ -172,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Данни" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "За прочитане" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Ревизия" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Участници" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Лиценз" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Разширения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "За JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." -msgstr "Файла не може да бъде намерен" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +msgstr "Файлът не може да бъде намерен." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -210,17 +355,13 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +"ПРЕДУПРЕЖДЕНИЕ: Неочакван формат на базовия URL на API. Пренасочването към " +"страницата с историята на OSM вероятно ще е невъзможно. Базов URL на API: " +"\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Внимание" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +msgstr "Моля, изберете поне една качена вече точка, линия или връзка." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -228,8 +369,38 @@ "primitives only" msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: Стартират се прозорци за преглед само на първите {0} от " +"всичките {1} избрани примитиви." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Моля, изберете ред за изтриване." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Изберете един от вариантите:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Обедини точки" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Добавяне на точка..." @@ -241,14 +412,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +429,57 @@ msgstr "Редактиране: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Въведете координати за новата точка." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Използване на десетични градуси." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицателни стойности обозначават западното/южното полукълбо" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" -msgstr "Геогр. Ширина:" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +msgstr "Географска ширина:" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" -msgstr "Геогр. Дължина:" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +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:217 msgid "Align Nodes in Circle" msgstr "Подреди точките в кръг" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Преместване на избраните точки така, че да сформират окръжност." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +495,58 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Моля изберете поне четири точки." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "Информация" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Подреди точките в линия" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Премести избраните точки в линия" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Изберете не по-малко от три точки." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -348,19 +554,13 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +"Текущият брой на промените надхвърля максималния. Текущ брой - {0}, " +"максимален - {1}." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +msgstr "Превишаване възможностите на API" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -368,6 +568,8 @@ "{1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +"Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития " +"примитив {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -375,47 +577,49 @@ "length {2}. Values length is {3}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +"Дължината на стойността за етикет ''{0}'' на примитива {1} превишава " +"максимално позволената дължина {2}. Дължината на стойностите е {3}." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "данни" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "избор" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "свалено" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Показване на {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Промяна на мащаба за да може да се види {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +629,30 @@ msgstr "Изглед: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Няма нищо избрано за показване." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Няма конфликти за показване." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "Обедини линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "Обединява няколко отделни линии в една." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Обединяване на линии, влизащи в различни релации?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -458,13 +662,13 @@ "ги обеденим?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Комбиниране въпреки всичко" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Промени посоката?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -474,10 +678,10 @@ "посоката на някои от тях?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Връщане и Комбиниране" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -485,20 +689,20 @@ msgstr "Въведете стойности за всички конфликти." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Обединяване {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Всички линии бяха празни" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -517,112 +721,148 @@ msgstr "Копиране на избраните обекти в буфера за обмен." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Моля, изберете нещо за копиране." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Създаване окръжност" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Създаване на окръжност от три избрани точки" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Точките не са разположени по кръг" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +msgstr "Изберете точно 2 или 3 точки или път с точно 2 или 3 точки" + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Изтриване" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Изтриване на избраните обекти." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Презаписване" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "Файлът съществъва. Да го подменя ли?" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Разпределяне на точки" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" "Разпределяне на избраните точки на равни разстояния по дължината на линия" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Сваляне от OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Сваляне на картографски данни от OSM сървър." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Сваляне" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Моля изберете поне един тип данни за сваляне." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "Сваляне на референтните данни от OSM." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "Изтегляне на референтни точки..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "{0} конфликт(а) при въвеждането" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Грешки при Сваляне" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Зареждане родителите на примитива {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Дублиране" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -643,5 +883,5 @@ msgstr "Изход от програмата." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -651,58 +891,73 @@ "GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Експорт до GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Експорт на данните до GPX файл." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Няма нищо за експорт. Първо съберете някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "Параметърът {0} не трябва да е празен" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "Описание на GPS следата" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Добави информация за автора" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Истинско име" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "Мейл" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Авторски права (препратка)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Предефиниран" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Авторски права (година)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Ключови думи" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Опции за експорт" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Експорт и Записване" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -713,25 +968,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Грешка" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Изберете лиценз от набора" @@ -741,42 +976,45 @@ msgstr "Online-помощ за JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Отваряне в браузър" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Редактиране" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Презареди" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" "Възможно е да се редактират само справочните страници на JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Грешка при зареждане на страница {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." @@ -784,5 +1022,5 @@ "Страницата с помощ липсва. Създайте я на английски." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -800,14 +1038,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Показва информация за историята на OSM линии, точки или връзки." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Информация за елемент." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Показва информация за OSM точки, пътища или връзки." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -820,30 +1058,40 @@ msgstr "Включване на точката към състава на най-близката линия от път." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Свързване на точка с линия" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Няма бърза клавишна комбинация" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Сливане въпреки всичко" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Обединяване текущия слоя с долния." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Обедини точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Обедини точките в най-старата от тях." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Моля, изберете поне две точки за обединение." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Обединяване точки от различни релации?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -853,9 +1101,9 @@ "обедините?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Сливане въпреки всичко" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -863,60 +1111,71 @@ "използва." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Обедини {0} точки" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "избор" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Обновява текущо избраните примитиви от сървъра." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Огледално" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Обръщане огледално на избраните възли и пътища." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Моля изберете поне един възел или път." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "нагоре" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Преместване обекти {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "надолу" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "наляво" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "надясно" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Преместване {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Премества обектите {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Невъзможно да се премества обектите извън границите на света." @@ -924,5 +1183,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Нов" @@ -932,26 +1191,17 @@ msgstr "Създай нова карта." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "неименуван" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Отвори..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Отваряне на файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Не може да се прочете \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -980,36 +1230,37 @@ msgstr "URL за сваляне" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ортогонализиране" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Само два точки е позволено да бъдат избрани" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Селекцията трябва да се състои само от линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Използвате проеция EPSG:4326, което може да доведе
до нежелани " @@ -1017,9 +1268,9 @@ "за да не се появява повече това предупреждение.
Желаете ли да продължите?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Само една точка е избрана" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ортогонализиране" @@ -1035,11 +1286,11 @@ msgstr "Поставяне на съдържанието на буфера" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Поставяне на маркери" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Приложи маркерите от буфера за копиране към всички избрани обекти." @@ -1067,16 +1318,21 @@ msgstr "Повтаряне на последното отменено действие." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Преименуване на слой" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Също преименувай файл" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Не може да се преименува файла \"{0}\"." @@ -1090,9 +1346,9 @@ msgstr "Обръща посоката на линиите на всички избрани пътища." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Моля, изберете поне една линия." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Промяна посоката на линиите" @@ -1100,17 +1356,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Запазване" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Запазване на текущите данни." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Файлът {0} съществува. Презаписване?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1120,25 +1378,25 @@ "информирайте за тази грешка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Няма отворени документи. Няма какво да се съхранява." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Празен документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Документът не съдържа данни" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Записване въпреки всичко" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Конфликти" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1148,54 +1406,75 @@ "обработени все едно сте ги отменили всички. Да продължаваме ли?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Отхвърляне конфликтите и записване" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Съхраняване OSM файл" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Съхраняване GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Запис на слой" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Невъзможно да се създаде резервно копие." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Непознато разширение на файл: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Възникна грешка при записване." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Възникна грешка при възстановяване на резервно копие." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Неизвестно файлово разширение." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Възникна грешка при записване." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Възникна грешка при възстановяване на резервно копие." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Запазване като…" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Записване на текущите данни в нов файл." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Избиране на всичко" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1230,16 +1509,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Затваряне" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Разделяне на линия" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Разделяне на линията в избраната точка." @@ -1249,5 +1528,5 @@ msgstr "Текушата селекция не може да се използва за разделяне." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1255,5 +1534,5 @@ msgstr[1] "Избраните точки не са в средата на път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1269,9 +1548,9 @@ "изберете и пътя." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Избраните точки не се явяват част от един и същ път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1279,6 +1558,6 @@ msgstr[1] "Избраният път не съдържа избраните точки" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" @@ -1286,5 +1565,5 @@ "път." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1294,19 +1573,23 @@ "средата на пътя.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Всички нови линии са включени към релацията на база роля.\n" "Трябва да проверите това и при необходимост да внесете корекции." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Всички нови линии са включени към релацията на база роля.\n" +"Трябва да проверите това и при необходимост да внесете корекции." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1327,47 +1610,47 @@ msgstr "Вкл./изкл. глобалната настройка ''{0}''." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разсъедини пътища" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублиране на точки, които се използват от няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Тази точка не е свързана с към нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Никой от тези точки не са прикрепени за нещо друго." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Нито една от тези тези линии не е прикрепена за други" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Текущато избраните обекти не може да се разсъединят." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Изберете един от вариантите:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Един маркиран възел, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Една точка, която се използва от няколко линии, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Една точка, която се използва от няколко линии и една от тези линии, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1375,5 +1658,5 @@ "* Една линия, която има точки, които се използват от няколко линии, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1382,5 +1665,5 @@ "няколко линии." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1393,9 +1676,9 @@ "дублирани възли и всички възли ще бъдат избрани." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Незапелен възел" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1403,5 +1686,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1417,142 +1700,92 @@ msgstr "Отменяне на последното действие." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Размаркиране всичко" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Сваля избора от всички обекти." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Размаркиране всичко (focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Размаркиране всичко (escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Обновяване на данните" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Обновяване на текущия слой с данни от сървъра (презареждане на данните)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с " -"данни?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Не е открит слой с GPX данни." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "Не могат да се намерят примитиви с ID {0} в текущата база данни." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +msgstr "Обновява избраното" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +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:204 +msgstr "Няма избрани примитиви за обновяване." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +msgstr "Няма нищо избрано." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Качи на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Качване на всички промени на OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Обекти за добавяне:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Променени обекти:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Обекти за изтриване:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишете измененията на качваните от вас данни:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "Качване на тези промени?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Качване на промени" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Нищо за качване. Първо създайте някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Има неразрешени конфликти. Първо трябва да ги разрешите." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Няма промени за качване." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +msgstr "Синхронизирани само {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +msgstr "Синхронизиране на целия набор данни" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1566,17 +1799,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" -msgstr "" +msgstr "Забелязан е конфликт." #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +msgstr "неочаквана върната стойност {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1587,54 +1820,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +"Предупреждение: Началната част \"{0}\" не отговаря на очаквания шаблон \"{1}" +"\"!" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" +"Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " +"\"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "Качването към OSM API пропадна." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Обновяване на примитива." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Качване на всички промени на OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

The error message is:" +"
{0}" +msgstr "" +"Качването пропадна защото примитивът, който се " +"опитахте
да изтриете на съсрвъра вече е изтрит там.

Съобщението " +"за грешка е:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Примитивът вече е изтрит." + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Съобщение за деня не е налично" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- изпълняващата се версия е {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Зареждане на \"Съобщение на деня\"" @@ -3043,62 +3467,57 @@ msgstr "Парола" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "Не е намерен превод за локал {0}. Връщане към {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "използване" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Показване на тази помощ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Стандартен параметри на unix геометрия" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Сваляне на област в предала на рамка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Отваряне на файл (како GPS данни, ако е .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Сваляне на област от рамка, като GPS данни" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Избор с даденото търсене" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Стартиране в максимизиран режим" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Възстановяване на параметрите по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Избор език." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "примери" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3108,51 +3527,51 @@ "че зареждате данни преди --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Вместо --download= може да укажете osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Активиране обновените разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Зареждане на ранните разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Настройки по умълчание" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Зареждане на разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3160,21 +3579,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Превключване режим каркас" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Пълен екран" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Превключване изглед на цял екран" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Аудио" @@ -3218,53 +3637,68 @@ msgstr "мащаб" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Географската дължина на показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Название на обекта сочен от показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Географска ширина на показалеца на мишката." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Ъгъл между предишния и текущия сегмент от пътя" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Направлението на създавания линеен сегмент." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Дължина на новосъздавания линеен сегмент." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(няма обект)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "слоя не е в списъка." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Свързване с OSM сървър..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Грешка при разбор" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "Файлът не е намерен" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3287,4 +3721,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Инициализиране" @@ -3316,20 +3751,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Маркери" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3337,47 +3772,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3385,25 +3820,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3440,5 +3875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3449,5 +3884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3461,5 +3896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3534,7 +3969,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3608,14 +4042,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3644,10 +4078,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3656,19 +4090,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Да, възстанови от изтриване също" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Не, отказване на операцията" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3679,9 +4113,9 @@ "сървъра.

Желаете ли да възстановим и тези възли също?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Възстановяване на изтрити допълнителни възли?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3693,13 +4127,13 @@ "изтрити на сървъра.

Желаете ли да ги възстановим и тях също?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Възстановяване след изтриване на свързани примитиви?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3707,90 +4141,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(никой)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3800,5 +4234,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3823,12 +4257,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3873,10 +4306,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3885,10 +4318,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3897,5 +4330,5 @@ msgstr "Стойност" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3955,9 +4388,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3965,5 +4398,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3993,42 +4426,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Изберете на картата всички обекти, избрани в списъка по-горе." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Продължи" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, 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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Разрешаване на конфликти" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4046,96 +4496,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Слоеве" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Отваряне списъка с всички заредени слоеве." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Изтриване избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Има несъхранени промени. Изтриване на слоя въпреки това?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Изтриване на слой" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Искате ли наистина да изтриете целия слой?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Информация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "да" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "С" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Изтриване" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Изтриване {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Показване/скриване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Превключване видимостта на избрания слой." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Показване/скирване на Текст/Икони" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Превключване видимостта на маркер текста и икони." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Слоеве" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Отваряне списъка с всички заредени слоеве." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "частен" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Изтриване избрания слой." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Обединяване текущия слоя с долния." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Преместване избрания слой един ред нагоре." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Преместване избрания слой един ред надолу." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Обединяване текущия слоя с долния." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Слоеве: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Информационно табло" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4144,22 +4628,28 @@ msgstr[1] "Това ще промени до {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Празна стойност изтрива ключа." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<различни>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Промени стойностите?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4168,84 +4658,89 @@ msgstr[1] "Промяна параметрите на {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Моля, изберете ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Изберете стойност" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Моля, изберете обектите, чиито параметри искате да промените." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Параметри/Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Параметри на избраните обекти" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Промени релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Изваждане на избраните обекти от релация {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Добави" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Редактиране на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Изтриване на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Изтриване на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойства: {0} / Членство: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Параметри / Отношения" @@ -4254,63 +4749,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Отваряне списък с всички релации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Релации: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Отвори редактор за избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Изтриване на избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Създай нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Релации: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Отвори редактор за избраната релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Изтриване на избраната релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Текуща селекция" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Отваряне на списък с избрани обекти." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Мащабирай до избрания(те) елемент(и)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Обнови списъка с избраните." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Мащабиране по селекцията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Избор" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4319,5 +4816,5 @@ msgstr[1] "{0} пътя" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4326,5 +4823,5 @@ msgstr[1] "{0} релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4335,5 +4832,10 @@ msgstr "Отсъедини панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4342,143 +4844,411 @@ "левия панел." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Автори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Покажи списък хора, работещи по избраните обекти." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Автор" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "брой обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Автори: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Област за сваляне" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Изтриване на избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Сваляне на видимите квадранти" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Конфликт в данните" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Релации" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Сваляне {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Релации" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Премахнати елементи от Релации" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

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

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Конфликт в данните" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Запазване на текущите данни." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "ОК" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Сваляне всички непълни пътища и възли от релацията" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Сваляне членове" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Потвърждение на действието на дистанционното управление" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Намаляване" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Преместване на текущо избраните членове надолу" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Приложи промените" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Основен" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Обект" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Преместване нагоре" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Преместване на текущо избраните членове нагоре" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Добавяне на избраните" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Добавяне на всички текущо обекти като членове" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Изтриване на избраното" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Изтриване на всички текущи избрани обекти от релацията" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Преместване надолу" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Преместване на текущо избраните членове надолу" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Изтриване на члена от текущия ред на таблицата от тази релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Сваляне членове" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Сваляне всички непълни пътища и възли от релацията" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Редактор релации: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Зареди избраното" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4488,5 +5258,5 @@ msgstr "<няколко>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4496,25 +5266,22 @@ msgstr[1] "Премахване стари ключове от {0} обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Обновяване свойствата на {0} обекта" -msgstr[1] "Обновяване свойствата на {0} обекти" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Отметки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Моля, въведете първо желаните координати." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Моля въведете име на мястото." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Промяна местоположение" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Изберете първо отметка" @@ -4549,17 +5316,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Източници и типове данни" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Свали като нов слой" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Област за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4567,18 +5334,18 @@ "на заявката." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Областта за сваляне е ок, размера е приемлив за сървъра." #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Грешка! Възможно е да липсват маркери (тагове)." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Моля задайте низ за търсене" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Не може да се получат резултати от търсене от сървъра" @@ -4586,5 +5353,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Въведете име на място за търсене:" @@ -4592,5 +5359,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4598,6 +5365,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "име" @@ -4636,6 +5403,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4658,15 +5425,15 @@ msgstr "тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "близо" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "мащаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4675,5 +5442,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Интерактивна карта" @@ -4705,5 +5472,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5445,5 +6218,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5610,59 +6383,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Изображения за {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Прочитане GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Не е указано време за точка {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Не е намерено изображение с информация за времето." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Четене {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Изображения с данни за местоположение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS Начало: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS Край: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "текуща разлика: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "разлика в часови пояси: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5670,138 +6443,128 @@ msgstr[1] "изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} в пределите на следата" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Синхронизация часовник" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." -msgstr "Невозможно да се прочете датата от файла \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Липсва EXIF време във файла \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Часова зона на GPS устойството (разлика със снимките)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизиране времето с GPS приемника" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Въведенето време не може да бъде използвано." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "GPS точка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Настройка рисуването на линии" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Използвай глобалните настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Не чертай линии между точките на този слой." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Избиране варианти за чертане на линиите." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Избор цвят" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "ОК" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "По подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Изберете цвят" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Маркери от наименувани точки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Наименувани точки от следа от {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Импорт Аудио" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave аудио файлове (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Аудио маркери от {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Импорт на изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5810,5 +6573,5 @@ msgstr[1] "{0} следи, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5817,5 +6580,5 @@ msgstr[1] "{0} маршрути, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5824,30 +6587,30 @@ msgstr[1] "{0} точки на интерес" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Времеви интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Дължина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Преобразувай в слой данни" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5857,43 +6620,43 @@ "
Ако искате да качвате следи, погледнете тук:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Преобразувано от: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} метри" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5904,9 +6667,9 @@ "Продължаване?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Няма GPX следа в слоя за да асоциираме звук с нея." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5916,5 +6679,5 @@ "са пропуснати или преместени в началото." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5924,47 +6687,47 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} изтрити.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5989,5 +6752,5 @@ msgstr[1] "следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5995,5 +6758,5 @@ msgstr[1] "точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6002,5 +6765,5 @@ msgstr[1] "следа с {0} точки" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6009,5 +6772,5 @@ msgstr[1] "{0} се състои от {1} следи" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6026,5 +6789,5 @@ msgstr[1] "маркери" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6033,9 +6796,9 @@ msgstr[1] "{0} се състои от {1} маркери" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Синхронизиране аудио" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6044,20 +6807,20 @@ "синхронизиращ сигнал." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Аудио синхронизирано на точка {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Установи аудио маркер на позицията на прослушване" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6067,11 +6830,18 @@ "маркера." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Показване/скирване на Текст/Икони" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Превключване видимостта на маркер текста и икони." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6081,5 +6851,5 @@ "асоцииран звук прослушвате (след първия маркер)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6089,29 +6859,29 @@ "върху точка от следа, където искате да синхронизирате." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Невъзможно да се създаде нов аудио-маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Възникна грешка при опит да се покаже URL препратката за този маркер" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL беше: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Грешка показване URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Разширени настройки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Директна настройка на параметрите. Ползвайте внимателно." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6119,27 +6889,27 @@ msgstr "Търси: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Текуща стойност по подразбиране." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Текущата стойност е ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "Стойност по подразбиране неизвестна (настройката все още не е използвана)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Моля, изберете ред за редактиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6147,14 +6917,14 @@ msgstr "Нова стойност за {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Моля, изберете ред за изтриване." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Въведете нова двойка ключ/стойност" @@ -6293,40 +7063,40 @@ msgstr "Калибровка на звукозаписа" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Цвят" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Стил на изобразяване {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Изберете" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Изберете цвят за {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Задай по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Задай всички да са по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Цветове, използвани от различни обекти в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Цветове" @@ -6671,46 +7441,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Настройка на достъпните разширения." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Свали списък" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Обновяване" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Настройване сайтове..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Моля, изберете елемент." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Описание на символ" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Настройка сайтове за разширения" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Настройки на дисплея" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6718,29 +7497,29 @@ msgstr "Различни настройки, влияещи на външния вид на програмата." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Настройки на връзката" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Параметри на връзката с OSM сървъра." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Настройки на картата" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Параметри на проекцията на картата и интерпретацията на данните." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Аудио настройки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Параметри за звуковия плейър и звуковите маркери." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6844,59 +7623,61 @@ msgstr "Бърз клавиш" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Моля изберете ред за копиране." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Изтриване на източник от списъка" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7090,33 +7871,33 @@ msgstr "Група модификатори" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Повече информация за тази възможност" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Незадължителни Атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Използване шаблон ''{0}'' от група ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Използване шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "затворен път" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7127,15 +7908,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7145,18 +7926,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Промяна параметри" @@ -7167,33 +7948,36 @@ msgstr "Група шаблони ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Свързване с OSM Сървър..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Зареждане точки {0} до {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Сваляне данни от OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Грешка! Възможно е да липсват маркери (тагове)." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Подготвяне на данните..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Не може да се прочете \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7201,21 +7985,21 @@ msgstr "GPX файлове" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Маркери от {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7231,10 +8015,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Сваляне данни от OSM..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7242,48 +8045,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 файлове" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Координати импортирани: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Неправилно съставено изречение: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Грешка в контролните суми: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Неизвестно изречение: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Нулеви координати: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Успешно NMEA импортиране" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Грешка при NMEA импортиране!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Тази версия на JOSM е несъвместима с конфигурирания сървър." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7294,15 +8096,15 @@ "{0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7310,23 +8112,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Отваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Няма съществуващ набор промени за качване на разлики" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Качване..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Сканиране на директория {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7369,9 +8184,4 @@ msgid "Login" msgstr "Вход" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Прекъсване..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7422,66 +8232,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Грешка при разбор." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM сървърни файлове" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Неизвестна версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Версията липсва от OSM данните." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Неизвестна версия: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Намерен е елемент извън път." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "към няма обръщения ref." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Открит е маркер извън релация." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Непълна спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Недопустим обект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7489,46 +8303,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Липсва необходимия атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Подготовка на OSM данните..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Неправилен код на точка" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Свързване със сървъра..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7536,5 +8370,18 @@ "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7543,16 +8390,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Обновяване разширения" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Зареждане на разширенията" @@ -7569,5 +8411,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7576,23 +8418,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7603,33 +8445,31 @@ msgstr "В разширение {0} възникна грешка" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Внимание - заявено е зареждане на модул {0}. Този модул не се изисква вече." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Разширение {0} се изисква от разширение {1}, но не беше открито." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Модулът не е открит: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последно обновление на модула преди повече от {0} дни." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7640,21 +8480,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Изключване на разширение" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" -msgstr "Невозможно зареждането на модул {0}. Да се премахне ли от настройките?" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +msgstr "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Задържане на разширение" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7664,5 +8504,5 @@ "право да презаписва текущите." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7672,10 +8512,10 @@ "\"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Съгласно информацията в разширението, автора е {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7684,9 +8524,9 @@ "за грешка." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Разширението да бъде ли изключено?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7696,27 +8536,23 @@ "да изключим разширенето." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Разширението не може да бъде изтрито. Моля съобщете на разработчиците на " -"JOSM за този проблем." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Информация" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Информация за разширението не е намерена." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "няма описание" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7725,13 +8561,18 @@ msgstr[1] "Сваляне на информация за разширението от {0} сайта" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Информация за разширението не е намерена." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Всички инсталирани разширения са последна версия." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7744,9 +8585,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Сваляне на липсващи разширения" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7759,57 +8600,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "неизвестно" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Разширения доставяни с JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Грешка при четене на файла с описанието на разширението: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Това е след края на записа" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Грешка при възпроизвеждане на звука" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Не прави нищо" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Съобщаване за грешка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7823,14 +8642,14 @@ "на JOSM, бъдете така добри да съобщите за проблема." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Неочаквана грешка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Моля, съобщете за грешката на адрес {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7838,5 +8657,5 @@ "се може по-подробно!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7846,17 +8665,33 @@ "да съобщите за грешка." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Прикрепете следната информация към репорта ви:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текста вече е кипиран в буфера за обмен на данни)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Да не се показва повече" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "Не е намерен превод за локал {0}. Връщане към {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7870,5 +8705,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7878,5 +8713,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7887,14 +8722,29 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" "(Съвет: Можете да настроите бързите клавиши в настройките на програмата.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Създаване мрежа от пътища" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7904,21 +8754,21 @@ "възли и поне един общ." -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Изберете два пътя с общ възел" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Изберете два пътя с единствен общ възел" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Създаване мрежа от пътища" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Качване на следа" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7926,74 +8776,75 @@ msgstr "Качване на следи" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Публична" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Избрано така прави вашата следа публичка в openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Моля въведете описание за вашата следа." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Моля въведете маркери за вашата следа." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Избрана следа: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Свързване..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Качването е отменено" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Грешка при качване" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Качване на GPX данни беше успешно" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Качването неуспешно. Сървърът върна следното съобщение: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Качване GPX следа: {0}% ({1} of {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Не е придоставено описание. Моля напишете някакво." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Няма избран GPX слой. Не може да се качи следа." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Не е посочено потребителско име." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Не е посочена парола." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Качване на GPX следа" @@ -8063,33 +8914,34 @@ msgstr "Един от избраните файлове е празен !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Прочитане на снимки..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Невъзможно да се вземе каноничното име на директория {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Сканиране на директория {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Намерен е празен файл в директория {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Грешка при четене на файлове от директория {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Корелиране към GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8109,15 +8961,15 @@ msgstr "GPX Файлове (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файлът {0} е зареден вече под името \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Грешка при разбор {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8129,34 +8981,34 @@ "изберете времева зона
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Време на снимката (от EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps време (прочетено от снимката по-горе): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Намирам се в часовата зона: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Без дата" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Отваряне друга снимка" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Синхронизиране време от снимка на GPS приемник" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8166,29 +9018,29 @@ "Моля използвайте изисквания формат!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Невалидна дата" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "<Няма още GPX следи заредени>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX следа: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Отвори друга GPX следа" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Часова зона: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Отместване:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8196,41 +9048,41 @@ "помогне?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Обновяване позицията на: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Всички изображения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Изображението няма EXIF позиция" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Няма още маркирани изображения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Съпоставяне на изображения с GPX следа" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Корелнутииране" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Авто-отгатване" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Трябва да изберете GPX следа" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Няма избрана GPX следа" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8241,9 +9093,9 @@ "Очакван формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Невалидна часова зона" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8254,65 +9106,65 @@ "Очакван формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Невалидно отместване" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Открити {0} съвпадения на {1} в GPX следа {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX Следата е заредена" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Избраните снимки не съдържат времева информация." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Снимките не съдържат времева информация" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX следата няма информация за времето" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Часови пояс: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Минути: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Секунди: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Съотнесени {0} от {1} снимки към GPX следа." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Времева разлика от {0} дни)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Разминаване между следата и снимките: {0}мин {1}сек" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8320,13 +9172,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Съотнасянето на снимки към следа се провали" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Настройване часови пояс и отместване" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Стойности по подразбиране" @@ -8348,5 +9200,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Грешка при зареждане на файла" @@ -8369,6 +9221,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Невалидно url." @@ -8549,22 +9401,22 @@ msgstr "Добавяне на \"source=...\" към ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Сваляне {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Свързване с WMS Сървър..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Създаване на сгради" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8574,18 +9426,18 @@ "размера на импорта на сгради е ограничен до 1 km2 макс." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Моля, включете авто-източниците и проверете cadastre millesime." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Екстракт SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Екстракт най-добре съвпадаща граница..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Създаване на граница" @@ -8703,6 +9555,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Празен слой" @@ -8731,5 +9583,5 @@ msgstr "Комуна bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8740,14 +9592,14 @@ "Моля, създайте нов кеш." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Грешка на кеш формата" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Грешка в кеширането на Ламбертовата зона" @@ -8835,4 +9687,9 @@ msgstr "Невъзможно да се създаде копие на неподредена линия." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Никакви данни не са заредени." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8843,9 +9700,9 @@ msgstr "Създаване на копие на път" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Слой за редактиране на GPX следи" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Преобразуване към GPX слой с анонимно време" @@ -8966,30 +9823,30 @@ msgstr "изтриване на данните след импорт" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Импортиране на данни от устройство." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Импортиране данни от DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Грешка при изтриване на данни." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Импортирани данни от {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "На устройството не са открити данни." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Връзката се разпадна." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9001,14 +9858,14 @@ "mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat Импорт" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Импорт данни от Globalsat Datalogger DG100 в GPX слой." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Импорт" @@ -9099,40 +9956,40 @@ msgstr "Отваряне на изобранията в ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Индекс на посоката '{0}' не е намерен" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Началното положение е извън границите на рамката" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Търсене на бреговата линия..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} точки дотук..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Трасиране на езера" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Грешка при създаване на кеш директория: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Проследяване" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "проверка на кеша..." @@ -9141,26 +9998,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Опростяване на геометрията..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Апроксимация Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Изтриване на повтарящи се точки..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker трасиране" @@ -9245,7 +10094,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "вода" @@ -9403,9 +10252,9 @@ msgstr "Lakewalker Настройки на разширението" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Сваляне на квадрат с изображение..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Невъзможно да се получи изображение" @@ -9655,18 +10504,18 @@ msgstr "Неизвестен статус на проблема" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Отваряне на видимите..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Отваряне само на файлове, които са видими в текущата област на екрана." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Не е отворена област - невъзможно е да се определят границите!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9693,34 +10542,34 @@ msgstr "изпълним файл на Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "зареждане данни от API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "промяна на селекцията" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "промяна областта видима на екрана" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "ръчно потвърждаване на всички действия на дистанционното управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" "Разширение, което позволява JOSM да бъде управляван от други приложения." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Дистанционно" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Настройки на разширението за дистанционно управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9732,29 +10581,29 @@ "за да се свързват с него." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Позволени действия" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" "Дистанционното управление получи заявка за зареждане на данни от API-то." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Подробности на заявката: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Желаете ли да разрешите това?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Потвърждение на действието на дистанционното управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -10021,4 +10870,25 @@ msgstr "Подчертване" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Обновяване свойствата на {0} обекта" +msgstr[1] "Обновяване свойствата на {0} обекти" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10277,34 +11147,34 @@ msgstr "Отваряне на диалог, който позволява прескачена до определена позиция" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Въвеждане Шир/Дълж за прескачане до позиция." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Можете също да поставите препратка URL от www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Мащаб (в метри)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Прескочи там" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Прескачане на позиция" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Не може да бъде прочетена Широчината, Дължината или Мащаба. Моля проверете." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Неможе да се прочете Дълж/Шир" @@ -10338,6 +11208,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Грешки при проверка" @@ -10347,10 +11217,10 @@ msgstr "Няма грешки при проверката" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Мрежа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10441,23 +11311,15 @@ msgstr "Изпълнение на проверка на данните" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Данните съдържат грешки. Да се качват ли въпреки това?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Отваряне на прозореца с проверките." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Показване на проблема" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Проверка" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Проверяване на избранато или всички данни." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10530,22 +11392,22 @@ msgstr "Пресичащи се пътища" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Повтарящи се точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Този тест проверява за точки, които се намират на едно и също място." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Повтарящи се точки от път." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Проверява за пътища с последователни точки с еднакви координати" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Повтарящи се точки" @@ -10624,9 +11486,9 @@ "правописни грешки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Проверка на параметрите:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -10634,15 +11496,15 @@ "стойности" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Невалидна линия на таг-проверка - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Невалидна линия на правописна проверка: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10653,7 +11515,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Неправилна комбинация маркер/стойност" @@ -10661,78 +11523,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Проблем с изобразяването" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправилен ключ ''{0}''." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Маркери с празни стойности" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Неправилен параметров ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Неправилен интервал в ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Стойност на параметър започва или завършва с интервал" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Стойности съдържащи HTML елементи" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключ ''{0}'' не е намерен в шаблони." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Шаблоните не съдържат такъв ключ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Шаблоните не съдържат стойност" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "ЗА ПОПРАВКА" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Проверка на ключовете." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверяване за валидни ключове и сравняване със списък от думи." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Използване на сложен параметров тест." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Проверяване стойностите и маркерите използвайки по-сложни правила." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Източници за TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10743,83 +11607,83 @@ "маркирането." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Добавяне нов източник в списъка." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Редактиране избрания източник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Източници на данни" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Проверка стойностите." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Проверяване дали стойностите са правилни спрямо шаблони." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Проверка за маркерни \"ЗА ПОПРАВКА\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Търси точки или пътища с \"FIXME\" в някой стойност на ключ." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Проверка за бележки при рисуване." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Проверява дали картата при русиване е открила грешки в данните." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Използване на файл с данни по подразбиране." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Използване на файла с данни по подразбиране (препоръчвано)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Използване на файла за проверка на правопис по подразбиране." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" "Използване на файла за проверка на правопис по подразбиране (препоръчвано)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Поправи параметрите" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Не може да бъде открит типа на елемента" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Не може да бъде открито нивото на предупрежение" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Неправилен израз ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10964,7 +11828,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "сграда" @@ -10978,5 +11842,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "област" @@ -11010,10 +11874,10 @@ msgstr "Свързан край на път е близо до друг път" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Немаркирани или несвързани точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11069,8 +11933,32 @@ msgstr "Обърната посока на линията на сушата: земята не е от ляво" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11081,10 +11969,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11133,14 +12021,14 @@ msgstr "Помощ за модула WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Трансформирано изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11151,26 +12039,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11178,5 +12066,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11186,5 +12074,5 @@ msgstr "Настройте позицията на избрания WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11195,19 +12083,19 @@ "Това може да доведе до погрешни координати." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Автоматично сваляне" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS слой ({0}), сваляне в мащаб {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11216,88 +12104,88 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Алфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Грешка във формата на файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Отворете празен WMS слой за да заредите данни от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Настройки модул WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Име на меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Име на меню (по подразбиране)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (по подразбиране)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Въведете име на меню и WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Копирай стойностите по подразбиране" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11337,5 +12225,5 @@ #: build/specialmessages.java:10 msgid "Audio Device Unavailable" -msgstr "" +msgstr "Аудио устройството е недостъпно" #. Java message loading audio data @@ -11415,11 +12303,16 @@ msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Предоставя фонов слой, показващ мрежа на картата." #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11432,10 +12325,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Помага за векторизиране на WMS изображения." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11444,5 +12337,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11455,5 +12348,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11466,15 +12359,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Показва OpenLayers фоново изображение" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Вкарва проблеми от OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11484,5 +12377,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11492,5 +12385,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11501,15 +12394,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великият JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Позволява на други приложения да изпращат команди към JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11518,10 +12411,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Предоставя маршрутизиращи възможности." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11532,15 +12425,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволява добавянето на маркери/възли на текущата gps позиция." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Предоставя диалог за редактиране на маркери в табличен вид." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11554,10 +12447,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Създава терасовидни къщи от един блок." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11569,5 +12462,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11578,5 +12471,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11587,11 +12480,18 @@ "имената на маркерите." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12746,58 +13646,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12811,6 +13659,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "автомагистрала" @@ -12836,6 +13684,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "автострада" @@ -12861,6 +13709,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "главен / първокласен" @@ -12886,6 +13734,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "второкласен" @@ -12899,5 +13747,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "третокласен" @@ -12915,5 +13763,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "улица" @@ -12947,6 +13795,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "служебна" @@ -12973,6 +13821,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "ремонт" @@ -13022,5 +13870,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "кръгово" @@ -13999,5 +14847,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "блато" @@ -15728,27 +16576,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "спорт" @@ -18587,7 +19435,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "велосипед" @@ -18657,7 +19505,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "пеш" @@ -18683,5 +19531,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "метро" @@ -19172,13 +20020,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "остарял, вече невалиден" @@ -19220,5 +20068,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "кон" @@ -19438,4 +20286,66 @@ msgstr "бариера" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Магистрала" + #. color tertiary #. @@ -19470,6 +20380,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "улица" @@ -19525,7 +20435,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "път_от_пътна_мрежа" @@ -19581,8 +20491,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "ЖП" @@ -19603,5 +20513,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "услуги" @@ -19615,5 +20525,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "форд" @@ -19634,5 +20544,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "обръщало" @@ -19647,5 +20557,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "точка за връзка със спешна помощ" @@ -19660,5 +20570,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "речен бряг" @@ -19672,5 +20582,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "поток" @@ -19684,5 +20594,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "док" @@ -19710,5 +20620,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "акведукт" @@ -19876,13 +20786,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "изкуствени съоръжения" @@ -19944,7 +20854,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "ЖП точка" @@ -19967,10 +20877,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "друга ЖП линия" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "ЖП railover" @@ -20006,7 +20916,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "стара ЖП линия" @@ -20051,6 +20961,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "въздушен транспорт" @@ -20064,5 +20974,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "терминал" @@ -20084,5 +20994,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "Надземен_транспорт_тъмен" @@ -20096,5 +21006,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "Надземен_транспорт_светъл" @@ -20142,7 +21052,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "надземен транспорт" @@ -20159,5 +21069,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "лесна ски писта" @@ -20172,5 +21082,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "средно трудна ски писта" @@ -20185,5 +21095,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "ски писта за напреднали" @@ -20198,5 +21108,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "ски писта за експерти" @@ -20211,5 +21121,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "ски писта freeride" @@ -20224,5 +21134,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "ски писта за начинаещи" @@ -20327,10 +21237,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "захранване" @@ -20344,5 +21254,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "кей" @@ -20356,5 +21266,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "тръбопровод" @@ -20482,12 +21392,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "отдих и развлечение" @@ -20501,5 +21411,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "яхт пристан" @@ -20571,8 +21481,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "Обществени услуги" @@ -20674,10 +21584,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "Обществен трафик" @@ -21063,22 +21973,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "Обществено осветление" @@ -21110,6 +22020,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "светла_вода" @@ -21170,8 +22080,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "здравеопазване" @@ -21524,26 +22434,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "магазин" @@ -21615,8 +22525,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "хотел" @@ -21766,9 +22676,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "туризъм" @@ -21840,8 +22750,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "исторически" @@ -21912,8 +22822,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "зеленина" @@ -21927,5 +22837,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "кариер" @@ -21939,5 +22849,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "сметище" @@ -21959,5 +22869,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "басейн" @@ -21971,5 +22881,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "гора" @@ -21983,5 +22893,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "двор ферма" @@ -22004,5 +22914,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "търговия на дребно" @@ -22016,5 +22926,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "индустрия" @@ -22028,5 +22938,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "индустриални развалини" @@ -22040,5 +22950,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "зелена площ" @@ -22052,5 +22962,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "ЖП" @@ -22107,7 +23017,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "военни" @@ -22121,5 +23031,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "гробище" @@ -22132,5 +23042,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "връх" @@ -22145,5 +23055,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ледник" @@ -22157,5 +23067,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "вулкан" @@ -22210,8 +23120,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "природа" @@ -22225,5 +23135,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "храсталак" @@ -22237,5 +23147,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "пустош" @@ -22249,5 +23159,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "гора" @@ -22261,5 +23171,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "кал" @@ -22273,5 +23183,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "плаж" @@ -22349,8 +23259,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "маршрут" @@ -22398,7 +23308,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "граница" @@ -22540,10 +23450,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "място" @@ -22591,6 +23501,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "адрес" @@ -22851,20 +23761,20 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -22880,115 +23790,65 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" - -#~ msgid "Data Layer" -#~ msgstr "Слой с данни" - -#~ msgid "Uploading data" -#~ msgstr "Качване на данни" - -#~ msgid "Not implemented yet." -#~ msgstr "Не е добавено още." - -#~ msgid "Email" -#~ msgstr "Е-поща" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Разрешаване на конфликти" - -#~ msgid "There were conflicts during import." -#~ msgstr "Възникнаха конфликти при импортване." - -#~ msgid "Object" -#~ msgstr "Обект" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} обект има конфликти." -#~ msgstr[1] "{0} обекти има конфликти." - -#~ msgid "my version:" -#~ msgstr "моя версия:" - -#~ msgid "their version:" -#~ msgstr "тяхна версия:" - -#~ msgid "resolved version:" -#~ msgstr "оправена версия:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Потребителско име (email) за OSM акаунт." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM потребителско име (email)" - -#~ msgid "Unknown host" -#~ msgstr "Неизвестен хост" - -#~ msgid "position" -#~ msgstr "позиция" - -#~ msgid "different" -#~ msgstr "различно" - -#~ msgid "true" -#~ msgstr "истина" - -#~ msgid "false" -#~ msgstr "лъжа" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Разрешаване {0} конфликти в {1} обекти" - -#~ msgid "Change" -#~ msgstr "Промени" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Натиснете \"Презареди\" за обновяване на списъка" - -#~ msgid "Revert" -#~ msgstr "Възстановяване" - -#~ msgid "Date" -#~ msgstr "Дата" +msgstr "Terraserver Urban" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Невъзможност да се инициализира API. Моля, пробвайте по-късно." + +#~ msgid "API initialization failed" +#~ msgstr "Неуспешна иницилизация на API" #~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Възстановяване състоянието на всички текущо избрани обекти до версията, " -#~ "указана в списъка с промени." - -#~ msgid "Rotate" -#~ msgstr "Завъртане" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Маркери (празна стойност изтрива маркера)" - -#~ msgid "Error parsing server response." -#~ msgstr "Грешка при разбор на отговора на сървъра." - -#~ msgid "Cannot connect to server." -#~ msgstr "Невъзможно да се установи връзка със сървъра." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници." - -#~ msgid "Tagging preset source" -#~ msgstr "Източник на шаблони за маркиране" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Добавяне на нов източник на шаблони за маркиране към списъка." - -#~ msgid "Tagging preset sources" -#~ msgstr "Източници на шаблони за маркиране" +#~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с " +#~ "данни?" + +#~ msgid "No data" +#~ msgstr "Липсват данни" + +#~ msgid "Failed to update the selected primitives." +#~ msgstr "Грешка при обновяването на избраните примитиви." + +#~ msgid "Update failed" +#~ msgstr "Неуспешно обновяване." + +#~ msgid "Missing primitive" +#~ msgstr "Липсва примитив." + +#~ msgid "Layers: {0}" +#~ msgstr "Слоеве: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Изтриване на члена от текущия ред на таблицата от тази релация" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Разширението не може да бъде изтрито. Моля съобщете на разработчиците на " +#~ "JOSM за този проблем." + +#~ msgid "Validate" +#~ msgstr "Проверка" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Проверяване на избранато или всички данни." + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Разширението успешно обновено. Моля рестартирайте JOSM." +#~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично." #~ msgid "" @@ -22999,107 +23859,131 @@ #~ "повторете опита си по-късно." +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни" + #~ msgid "Commit comment" #~ msgstr "Коментар на съхранението" -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Разширението успешно обновено. Моля рестартирайте JOSM." -#~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни" +#~ msgid "Server does not support changesets" +#~ msgstr "Сървъра не поддържа управление на версиите" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}." + +#~ msgid "Aborting..." +#~ msgstr "Прекъсване..." + +#~ msgid "position" +#~ msgstr "позиция" + +#~ msgid "different" +#~ msgstr "различно" + +#~ msgid "false" +#~ msgstr "лъжа" + +#~ msgid "true" +#~ msgstr "истина" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Rotate" +#~ msgstr "Завъртане" + +#~ msgid "Change" +#~ msgstr "Промени" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Свързване с OSM сървър..." + +#~ msgid "Add Selected" +#~ msgstr "Добавяне на избраните" + +#~ msgid "Cannot connect to server." +#~ msgstr "Невъзможно да се установи връзка със сървъра." + +#~ msgid "Revert" +#~ msgstr "Възстановяване" + +#~ msgid "Date" +#~ msgstr "Дата" + +#~ msgid "Object" +#~ msgstr "Обект" + +#~ msgid "Not implemented yet." +#~ msgstr "Не е добавено още." + +#~ msgid "Conflicts: {0}" +#~ msgstr "Конфликти: {0}" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM потребителско име (email)" + +#~ msgid "their version:" +#~ msgstr "тяхна версия:" + +#~ msgid "resolved version:" +#~ msgstr "оправена версия:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} обект има конфликти." +#~ msgstr[1] "{0} обекти има конфликти." + +#~ msgid "my version:" +#~ msgstr "моя версия:" + +#~ msgid "Email" +#~ msgstr "Е-поща" + +#~ msgid "unnamed" +#~ msgstr "неименуван" + +#~ msgid "sports" +#~ msgstr "спортни" + +#~ msgid "Charge" +#~ msgstr "Такса" + +#~ msgid "Drawbridge" +#~ msgstr "Подвижен мост" + +#~ msgid "Portcullis" +#~ msgstr "Падаща решетка" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "подложка Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "viaduct" +#~ msgstr "виадукт" #~ msgid "Navigation" #~ msgstr "Навигация" -#~ msgid "image not loaded" -#~ msgstr "изображението не е заредено" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Мащабиране: с колелцето на мишката или двойно щракване. Преместване на " -#~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Настройване позицията на WMS слоя" - -#~ msgid "Charge" -#~ msgstr "Такса" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Сървъра не поддържа управление на версиите" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Разширението вече съществува" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Грешка при изтриването на файл на разширение: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Някои от точките са (почти) на една права" - -#~ msgid "Drawbridge" -#~ msgstr "Подвижен мост" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "подложка Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?" - -#~ msgid "Import TCX File..." -#~ msgstr "Импортиране на TCX Файл..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Импортиране на TCX файл като GPS следа" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с " -#~ "настройките.
Паролата се предава като обикновен текст до сървъра, " -#~ "включена в URL адрес.
Не използвайте ценна парола." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за " -#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за " -#~ "подробности." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS" #~ msgid "" @@ -23152,12 +24036,86 @@ #~ "ограничения, ако има съмнения, по-добре не използвайте." -#~ msgid "Portcullis" -#~ msgstr "Падаща решетка" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS" + +#~ msgid "Occupied By" +#~ msgstr "Обект" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Маркери (празна стойност изтрива маркера)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Добавяне на всички текущо обекти като членове" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Натиснете \"Презареди\" за обновяване на списъка" + +#~ msgid "Error parsing server response." +#~ msgstr "Грешка при разбор на отговора на сървъра." + +#~ msgid "There were conflicts during import." +#~ msgstr "Възникнаха конфликти при импортване." #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." #~ msgstr "" -#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично." +#~ "Възстановяване състоянието на всички текущо избрани обекти до версията, " +#~ "указана в списъка с промени." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Потребителско име (email) за OSM акаунт." + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с " +#~ "настройките.
Паролата се предава като обикновен текст до сървъра, " +#~ "включена в URL адрес.
Не използвайте ценна парола." + +#~ msgid "Tagging preset source" +#~ msgstr "Източник на шаблони за маркиране" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници." + +#~ msgid "Tagging preset sources" +#~ msgstr "Източници на шаблони за маркиране" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за " +#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за " +#~ "подробности." + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Добавяне на нов източник на шаблони за маркиране към списъка." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Грешка при изтриването на файл на разширение: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Разширението вече съществува" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да " +#~ "се се изтрие съществуващия архив?\n" +#~ "\n" +#~ "{0}" #~ msgid "" @@ -23174,20 +24132,21 @@ #~ "никакви данни на сървъра след това съобщение." -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да " -#~ "се се изтрие съществуващия архив?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Конфликти: {0}" - -#~ msgid "viaduct" -#~ msgstr "виадукт" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Разрешаване {0} конфликти в {1} обекти" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Някои от точките са (почти) на една права" + +#~ msgid "Data Layer" +#~ msgstr "Слой с данни" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Импортиране на TCX файл като GPS следа" + +#~ msgid "Import TCX File..." +#~ msgstr "Импортиране на TCX Файл..." + +#~ msgid "image not loaded" +#~ msgstr "изображението не е заредено" #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -23195,6 +24154,13 @@ #~ "Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне" -#~ msgid "sports" -#~ msgstr "спортни" +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Мащабиране: с колелцето на мишката или двойно щракване. Преместване на " +#~ "картата: Задръжте десния бутон на мишката и движете. Избор: Щракане." #~ msgid "" @@ -23203,4 +24169,10 @@ #~ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}" +#~ msgid "Remove Selected" +#~ msgstr "Изтриване на избраното" + +#~ msgid "Basic" +#~ msgstr "Основен" + #~ msgid "Delete and Download" #~ msgstr "Изтриване и Зареждане" @@ -23209,6 +24181,12 @@ #~ msgstr "Не са открити пресичания. Нищо не е променяно." -#~ msgid "Solve Conflict" -#~ msgstr "Разрешаване конфликт" +#~ msgid "Move Down" +#~ msgstr "Преместване надолу" + +#~ msgid "Move Up" +#~ msgstr "Преместване нагоре" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Редактор релации: {0}" #~ msgid "" @@ -23252,7 +24230,4 @@ #~ "Липсва страница с помощ. Създайте я на английски или " #~ "на вашия език." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Директно зареждане на TCX файлове от JOSM." #~ msgid "" @@ -23265,9 +24240,18 @@ #~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата." +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Директно зареждане на TCX файлове от JOSM." + +#~ msgid "Start routing" +#~ msgstr "Започни маршрутизиране" + #~ msgid "Remove route nodes" #~ msgstr "Премахване на възли от маршрут" -#~ msgid "Start routing" -#~ msgstr "Започни маршрутизиране" +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Качването на данни неуспя по неизяснена причина" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Не може да се прочетат числова стойност от отговора" #~ msgid "" @@ -23286,10 +24270,4 @@ #~ "Не качвайте никакви данни след това съобщение." -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Не може да се прочетат числова стойност от отговора" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Качването на данни неуспя по неизяснена причина" - #~ msgid "Undeleting Way..." #~ msgstr "Възстановяне от изтриване на път..." @@ -23301,10 +24279,10 @@ #~ msgstr "Възстановяване от изтриване на релация..." +#~ msgid "Keep mine" +#~ msgstr "Запази моят" + #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Проверка дали примитив {0} е заминал..." -#~ msgid "Keep mine" -#~ msgstr "Запази моят" - #~ msgid "Delete mine" #~ msgstr "Изтриване на моите" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 16826) +++ /applications/editors/josm/i18n/po/cs.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:11+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-21 15:36+0000\n" +"Last-Translator: Jezevec \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "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-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Vytváří se grafické rozhraní programu (GUI)" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Projekce {0} nemohla být aktivována. Používam Mercator." -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Neuložené změny" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Máte neuložené změny. Zahodit změny a pokračovat?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Uložit a ukončit" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Neuložit změny a ukončit" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Zrušit" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Varování" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "NEZNÁMÝ" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "O aplikaci" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Zobrazit obrazovku \"O Aplikaci\"" @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Verze {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Poslední změna v {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Verze Java: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Domovská stránka" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Nahlášení chyby" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Informace" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Readme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revize" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Příspěvek" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Pluginy" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "O JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Soubor nebyl nalezen" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -214,16 +358,9 @@ "\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Varování" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -234,7 +371,35 @@ "primitiv." +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Zvolte řádek k vymazání" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Vyberte buď:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Spojit uzly" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Přidat uzel..." @@ -246,14 +411,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -261,57 +428,57 @@ msgstr "Úpravy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Zadejte souřadnice nového uzlu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Použijte desetinné stupně." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Zeměpisná šířka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Zeměpisná délka" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Seřadit uzly do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Přesunout označené uzly do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -327,25 +494,58 @@ msgstr "Nástroj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Vyberte minimálně 4 uzly" +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Seřadit uzly do přímky" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Přesunout označené uzly na přímku" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Vyberte minimálně 3 uzly" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -356,18 +556,10 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Narušení schopností API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Selhala inicializace API, prosím zkuste to znovu později." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Selhala inicializace API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -377,5 +569,5 @@ "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -386,9 +578,9 @@ "Délka hodnoty je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Selhal předpoklad" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -396,37 +588,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:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "výběr" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "stáhnout" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zvětšit na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Zvětšit pohled na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -436,30 +628,30 @@ msgstr "Zobrazení: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Není zvoleno nic co by se dalo přiblížit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Prosím zvolte minimálně dvě cesty ke spojení" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Spojit cesty patřící do jiné relace?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -467,13 +659,13 @@ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Přesto zkombinovat" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Změnit směr ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -483,10 +675,10 @@ "orientaci?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Otočit a zkombinovat" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -494,20 +686,20 @@ msgstr "Zadej hodnoty pro všechny konflikty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Kombinovat {0} cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Všechny cesty byli prázdné" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -524,23 +716,24 @@ msgstr "Vybrat označené objekty pro vložení." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Prosím zvol něco ke kopírování" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Vytvořit kruh" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Vytvořit kruh ze tří uzlů" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Tyto uzly nejsou v kruhu" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -549,87 +742,122 @@ "Prosím, vyberte přesně dva nebo tři body nebo cestu se dvěma či třemi body." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Smazat" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Smazat označené objekty" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Přepsat" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Rozdělit uzly" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Stáhnout data z OSM serveru" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Soubor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Stáhnout" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Prosím zvol aspoň jeden úkol ke stažení" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Došlo k {0} konfliktům během importu." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Chyby při stahování" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplikovat" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovat výběr kopírováním a vložením." @@ -649,5 +877,5 @@ msgstr "Ukončit JOSM" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -657,58 +885,73 @@ "licencované pod GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportovat do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportovat data do GPX souboru." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nic nevyexportováno. Nejdříve stáhněte data." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "popis gps trasy" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Přidat informace autora" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Skutečné jméno" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "Email" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Předdefinováno" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Klíčová slova" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Nastavení Exportu" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportovat a uložit" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -719,25 +962,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Chyba" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Zvolte předdefinovanou licenci" @@ -747,46 +970,49 @@ msgstr "JOSM Online Nápověda" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Otevřít v prohlížeči" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Upravit" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Znovu načíst" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Chyba při načítání stránky {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Chybí stránka nápovědy. Vytvořte ji v češtině." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -813,5 +1039,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -824,30 +1050,40 @@ msgstr "Napojit bod na nejbližší část cesty" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Spojit uzly a linie" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Beze zkratky" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Přesto sloučit" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Spojit vrstvy pod označenou" + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -856,68 +1092,79 @@ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Přesto sloučit" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Spojit {0} uzly" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "výběr" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Aktualizovat právě vybrané prvky ze serveru" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Zrcadlit" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgstr "Zrcadlit vybrané body a cesty." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 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:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "nahoru" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Přesunout objekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "dolů" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "vlevo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "vpravo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Přesunout {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Přesunutí objektů {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nemohu přesouvat objekty mimo svět." @@ -925,5 +1172,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nový" @@ -933,26 +1180,17 @@ msgstr "Vytvořit novou mapu" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "nepojmenováno" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Otevřít..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Otevřít soubor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nemůžu číst \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -981,34 +1219,35 @@ msgstr "URL ke stažení" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ortogonalizovat tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Povoleny pouze dva uzly" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Výběr se musí skládat pouze z cest" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Pužíváte EPSG:4326 projekci, což může vást
k nechtěným výsledkům " @@ -1016,9 +1255,9 @@ "varování.
Chcete pokračovat?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Vybrán pouze jeden uzel" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ortogonalizovat" @@ -1034,11 +1273,11 @@ msgstr "Vložit ze schránky" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Vložit Popisky" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty." @@ -1066,16 +1305,21 @@ msgstr "Vrátit zpět poslední vrácenou akci" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Přejmenovat vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Také přejmenovat soubor" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Nemohu přejmenovat soubor \"{0}." @@ -1089,9 +1333,9 @@ msgstr "Otočit směr všech zvolených cest" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Zvolte minimálně jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Otočit cesty" @@ -1099,17 +1343,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Uložit aktuální data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Soubor {0} již existuje. Přepsat ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1118,25 +1364,25 @@ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Není otevřený žádný dokument, není co uložit." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Prázdný dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokument neobsahuje žádná data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Přesto uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1146,54 +1392,75 @@ "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Zamítnout konflikty a uložit" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Uložit OSM soubor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Uložit GPX soubor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Ulož vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Nemohu zálohovat soubor." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Neznámá koncovka souboru: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Během obnovení zálohy došlo k chybě." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Neznámá přípona souboru." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Během ukládání došlo k chybě." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Během obnovení zálohy došlo k chybě." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Uložit jako..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Uložit aktuální data do nového souboru" +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Vybrat vše" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1228,16 +1495,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Zavřít" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Rozdělit cestu" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Rozdělit cestu zvoleným uzlem" @@ -1247,5 +1514,5 @@ msgstr "Tento výběr nemůže být použit k rozdělení." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1254,5 +1521,5 @@ msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1265,9 +1532,9 @@ msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Zvolené uzly nesdílejí stejnou cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1276,10 +1543,10 @@ msgstr[2] "Označené cesty neobsahují vybrané uzly." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1289,8 +1556,9 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Příslušnost k relaci byla zkopírována na všechny nově vzniklé cesty.\n" @@ -1298,11 +1566,14 @@ "měly být opraveny." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Členství v relacích bylo zkopírováno na všechny nové cesty.\n" +"Měl by jste výsledek zkontrolovat a pokud je třeba opravit." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1323,47 +1594,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Jeden otagovaný uzel, nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Jeden uzel používaný více než jednou cestou, nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1372,5 +1643,5 @@ "nebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1379,5 +1650,5 @@ "cestě." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1390,9 +1661,9 @@ "své vlastní kopie a všechny uzly budou vybrány." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Nespojený uzel" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1400,5 +1671,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1414,141 +1685,91 @@ msgstr "Vrátit poslední akci." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Odznačit vše" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Odznačit všechny objekty" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Odznačit vše (Fokus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Odznačit vše (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Aktualizovat data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou " -"vrstvu?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Aktualizace selhala" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Nenalezena vrstva s GPX daty." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" +msgstr "V aktuální datové sadě nemohu nalézt primitiva s id {0}" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Aktualizovat výběr" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +msgstr "Aktualizovat právě vybrané prvky ze serveru" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +msgstr "Nejsou vybrány žádné prvky pro aktualizaci." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Prázdný výběr" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Nahrát do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Nahrát všechy změny na OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objekty k přidání:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objekty ke změnění:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objekty ke smazání:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Nahrát tyto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Nahrát změny na server" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Žádné změny k nahrání." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Nahrávám" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +msgstr "Synchronizovat pouze {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synchronizovat celý dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1561,18 +1782,25 @@ "{6} to abort and continue editing.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.
Konflikt je způsoben " +"{0} s id {1},
na serveru je verze {2}, " +"vaše verze je {3}.

Klikněte {4} pro synchronizaci " +"konfliktního prvku.
Klikněte {5} pro synchronizaci " +"kompletní lokální datové sady se serverem.
Klikněte {6} " +"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 msgid "Conflict detected" msgstr "Detekován konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "Neočekávaná návratová hodnota. Navráceno {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1582,57 +1810,71 @@ "{1} to abort and continue editing.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +"Aktualizace selhala, protože na serveru je novější " +"verze jednoho z vašich
bodů, cest nebo relací.

Klikněte " +"{0} pro synchronizaci kompletní lokální datové sady se serverem." +"
Klikněte {1} pro přerušení a pokračování editace.
" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +msgstr "Aktualizace selhala.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Nahrándí do OSM API selhalo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Aktualizuji prvky" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Nahrát všechy změny na OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Selhalo navázání komunikace s OSM serverem {0}.\n" -"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objekty k přidání:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objekty ke změnění:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1720,42 +1962,54 @@ msgstr "Zpomalené přehrávání" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Stahuji GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Stažená GPX data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Surová GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Stahuji data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Nic nebylo importováno" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Stahuji {0} z {1} ({2} zbývá)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Nahrávám data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Následující chbya nastala během hromadného stahování:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Chyby při stahování" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1766,22 +2020,27 @@ " to ignore.
" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +"Ve vaší lokální datové sadě je {0} prvků, které
mohou být na " +"serveru smazány. Pokud se pokusíte pozdějí o jejich smazání " +"nebo
aktualizaci, server bude pravděpodobně reportovat
konflikt." +"

Klikněte {1} pro zjištění stavu těchto prvků
na " +"serveru.
Klikněte {2} pro ignorování.
" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +msgstr "Smazané nebo přesunuté prvky" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Režim mazání" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Smaž body nebo cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1789,5 +2048,5 @@ msgstr "Režim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1797,761 +2056,23 @@ "když mažete trasu. CTRL: smazat referenční objekty." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Kreslit" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Kreslit uzly" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "vybráno" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Přidat uzel" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Přidat uzel do cesty" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Spojit existující cestu do uzlu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Přidat uzel do cesty a spojit" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Vytvořit nový uzel." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Vybrat uzel pod kurzorem." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Vložit nový uzel do cesty" -msgstr[1] "Vložit nový uzel do {0} cest." -msgstr[2] "Vložit nový uzel do {0} cest." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Pokračovat v cestě od posledního uzlu." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Dokončit kreslení" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Vytlačit" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Vytvořit plochy" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Vytáhnout cestu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Pusť myší tlačítko k zastavení otaáčení" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Táhni segmentem cesty a vytvoř obdelník." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Vybrat" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Zvol, posuň a otáčej objekty" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Přidat a posunout virtuální nový uzel do cesty" -msgstr[1] "Přidat a posunout virtuální nový uzel do {0} cest" -msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"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:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Objekty se přemísťují přetažením; Shift pro přidání do výběru (Ctrl pro " -"přidání/odebrání); Shift-Ctrl pro otáčení výběrem" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zvětšení" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Přiblížení a pohyb mapy" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Přibližování pomocí tažení nebo CTRL+. nebo CTRL+,; pohyb s CTRL+šipka " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Hledat..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Hledat objekty." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Nebyla načtena žádná data." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Zadjte hledaný řetězec." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "nahradit označené" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "přidat k výběru" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "odebrat z výběru" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "velikost písmen rozhoduje" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regulární výraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Speciální cíle:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - objekt s daným ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - všechny změněné objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - všechny vybrané objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - všechny nekompletní objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - všechny objekty bez tagů" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -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:101 -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:102 -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:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Použijte ( a ) k seskupení výrazů" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Hledat" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Začít hledání" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Nebyly nalezeny záznamy pro \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Nalezeno {0} odpovídajích výrazů" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Regulární výraz \"{0}\" má chybu na pozici {1}, celá chyba:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Chybějící argument pro \"NEBO\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Chybějící argument pro \"NOT\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Očekávám uzavírací závorku." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Chybný počet parametrů pro operátor nodes." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah " -"čísel, například nodes:10-20." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontakt {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Stahuji..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Nemohu číst z URL:\"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Chyba parsování v URL:\"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Chyba při komunikaci se serverem." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Odstraněno \"{0}\" pro {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Nastaveno {0}={1} pro {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekty" -msgstr[2] "objekty" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Odstraněno \"{0}\" pro {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Nastaveno {0}={1} pro {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Smazat {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Smazat {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Konfliktní relace" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Odstranit z relace" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Rozdělit segment cesty" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " -"problémy, protože jiné objekty (které nevidíte) je mohou používat." -"
Opravdu je chcete smazat?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Přesunout" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "uzel" -msgstr[1] "uzly" -msgstr[2] "uzly" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Použít ?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a " -"jejích bodů, z důvodů udržení konzistence dat?" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Vztah" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Stará role" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nová role" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Starý klíč" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Stará hodnota" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nový klíč" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nová hodnota" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Použít zvolené změny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Neprovádět změny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Vlastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Role v relaci odkazující na" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatická korekce popisků" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Předvolby uloženy na {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Nemohu nahrát předvolby ze serveru." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2563,7 +2084,803 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' nesmí být null" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Kreslit" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Kreslit uzly" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "vybráno" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Přidat uzel" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Přidat uzel do cesty" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Spojit existující cestu do uzlu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Přidat uzel do cesty a spojit" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Vytvořit nový uzel." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Vybrat uzel pod kurzorem." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Vložit nový uzel do cesty" +msgstr[1] "Vložit nový uzel do {0} cest." +msgstr[2] "Vložit nový uzel do {0} cest." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Pokračovat v cestě od posledního uzlu." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Dokončit kreslení" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Vytlačit" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Vytvořit plochy" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Vytáhnout cestu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Pusť myší tlačítko k zastavení otaáčení" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Táhni segmentem cesty a vytvoř obdelník." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Vybrat" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Zvol, posuň a otáčej objekty" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Přidat a posunout virtuální nový uzel do cesty" +msgstr[1] "Přidat a posunout virtuální nový uzel do {0} cest" +msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Přesun prvků" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Přesunul jste více než {0} prvků. Přesun velkého množství prvků je často " +"chybou.\n" +"Opravdu je chcete přesunout?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Přesunout je" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Vrátit zpět přesun" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"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:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Objekty se přemísťují přetažením; Shift pro přidání do výběru (Ctrl pro " +"přidání/odebrání); Shift-Ctrl pro otáčení výběrem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zvětšení" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Přiblížení a pohyb mapy" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Přibližování pomocí tažení nebo CTRL+. nebo CTRL+,; pohyb s CTRL+šipka " +"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:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Hledat..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Hledat objekty." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Zadjte hledaný řetězec." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "nahradit označené" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "přidat k výběru" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "odebrat z výběru" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "velikost písmen rozhoduje" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regulární výraz" + +#: ../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." + +#: ../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: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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Speciální cíle:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +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 +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: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 +msgid "modified - all changed objects" +msgstr "modified - všechny změněné objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - všechny vybrané objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - všechny nekompletní objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - všechny objekty bez tagů" + +#: ../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" + +#: ../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: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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Hledat" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Začít hledání" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Nalezeno {0} odpovídajích výrazů" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Regulární výraz \"{0}\" má chybu na pozici {1}, celá chyba:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Chybějící argument pro \"NEBO\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Chybějící argument pro \"NOT\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Očekávám uzavírací závorku." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Chybný počet parametrů pro operátor nodes." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah " +"čísel, například nodes:10-20." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Nahrát výběr" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontakt {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Stahuji..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, 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 +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}" +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}''" +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}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekty" +msgstr[2] "objekty" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Odstraněno \"{0}\" pro {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Nastaveno {0}={1} pro {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Změnit roli člena relace {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Vyřešit konfklikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Nebyly nalezeny záznamy pro \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Výběr \"{0}\" je používán v relaci \"{1}\".\n" +"Smazat z relace?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Rozdělit segment cesty" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Chystáte se smazat uzly mimo oblast, jež jste stáhli.
To může způsobit " +"problémy, protože jiné objekty (které nevidíte) je mohou používat." +"
Opravdu je chcete smazat?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Odstranit z relace" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Přesunout" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "uzel" +msgstr[1] "uzly" +msgstr[2] "uzly" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Odstraňuji 1 prvek" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "odstraňování reference z cesty {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Varování: Odstraňuji cestu {0} protože počet bodů klesl pod 2. Aktuálně je " +"{1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 "Odstranit člena relace {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Otočit {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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}" +msgstr "Vyřešte konflikt verzí mezi {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "Hlavní datová sada neobsahuje bod {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Použít ?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a " +"jejích bodů, z důvodů udržení konzistence dat?" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Vztah" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Stará role" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nová role" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Starý klíč" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Stará hodnota" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nový klíč" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nová hodnota" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Použít zvolené změny" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Neprovádět změny" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Vlastnosti " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Role v relaci odkazující na" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatická korekce popisků" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Předvolby uloženy na {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Nemohu nahrát předvolby ze serveru." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2592,34 +2909,34 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." -msgstr "" +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:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "nekompletní" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Varování: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +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:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2628,13 +2945,13 @@ msgstr[2] "cestami" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "cesty" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2643,22 +2960,22 @@ msgstr[2] "relace" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "vazby" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +msgstr "sada změn" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +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:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2673,23 +2990,23 @@ msgstr[2] "{0} prvků" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "silnice" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "železnice" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vodní tok" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "využití oblasti (landuse)" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2715,17 +3032,17 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 msgid "no earliest version found. History is empty." -msgstr "" +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 "" +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 "" +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 "" +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 @@ -2733,9 +3050,9 @@ #, java-format msgid "parameter ''{0}'' > 0 expected, got ''{1}''" -msgstr "" +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 "" +msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -2743,7 +3060,7 @@ #, java-format msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +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á." @@ -2881,9 +3198,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2900,5 +3212,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "pozadí" @@ -2909,8 +3221,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2927,5 +3239,5 @@ "kartografické projekce.." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambertova zóna (Francie)" @@ -2948,22 +3260,137 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Nemohu přečíst záložky." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Nemohu zapsat do záložek." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Znovu nezobrazovat" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Aktualizace na server selhala, protože vaše " +"aktuální
datová sada nesplňuje předpoklad.
Chybová zpráva je:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "neznámý" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Neočekávaná výjimka" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k " +"internetu." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +msgid "Unknown host" +msgstr "Neznámé jméno počítače" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Aktualizace selhala, protože prvek který mažete
je " +"již na serveru vymazán.

Chybová zpráva je:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Zprávu dne není možné zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- běžící verze je {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Stahuji zprávu dne" @@ -3023,4 +3450,6 @@ "URL which returns osm-xml" msgstr "" +"Přidat každý k původnímu výběru. Může obsahovat vyhledávací řetězec podobně " +"jako na Googlu nebo URL vracející osm-xml" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -3042,62 +3471,57 @@ msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, 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/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "použití" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Zobrazí tuto nápovědu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standardní unixová geometrie okna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Stáhnout ohraničující box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Spustit přes celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Nastavit výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Nastavit jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "příklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3107,51 +3531,51 @@ "selection nejprve nahrajte nějaká data." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Namísto --download= můžete zadat osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktivuji aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Načítám dřívější pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Nastavuji výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Načítám pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3159,21 +3583,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Přepnout drátový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Přepnout zobrazení na celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Zvuk" @@ -3217,53 +3641,68 @@ msgstr "měřítko" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Zeměpisná délka na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Jméno objektu na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Zeměpisná šířka na místě kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Úhel mezi předchozím a současným úsekem cesty." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Délka nového nakresleného segmentu trasy." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(žádný objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "vrstva není v seznamu" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Kontaktuji OSM server..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Chyba při parsování" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3285,4 +3724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inicializace" @@ -3314,68 +3754,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +msgstr "Vlastnosti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +msgstr "Body" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3383,27 +3823,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +msgstr "Členi (s konflikty)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +msgstr "Vlastnosti (s konflikty)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" -msgstr "" +msgstr "Řešení konfliktů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 @@ -3422,10 +3862,10 @@ #, java-format msgid "unexpected value of parameter \"index\". Got {0}" -msgstr "" +msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 #, java-format msgid "item {0} not found in list" -msgstr "" +msgstr "položka {0} nenalezena v seznamu" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220 @@ -3435,20 +3875,20 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228 msgid "Compare " -msgstr "" +msgstr "Porovnat " #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" -msgstr "" +msgstr "Má verze" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264 msgid "List of elements in my dataset, i.e. the local dataset" -msgstr "" +msgstr "Seznam prvků v mé datové sadě, např v lokální datové sadě" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" -msgstr "" +msgstr "Sloučená verze" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270 @@ -3456,30 +3896,30 @@ "List of merged elements. They will replace the my elements when the merge " "decisions are applied." -msgstr "" +msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení." #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" -msgstr "" +msgstr "Cizí verze" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276 msgid "List of elements in their dataset, i.e. the server dataset" -msgstr "" +msgstr "Seznam prvků v cizí datové sadě, např v serverové datové sadě" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409 msgid "> top" -msgstr "" +msgstr "> vrchol" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "" +msgstr "Kopírovat mé vybrané body na začátek seznamu slučovaných bodů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436 msgid "> bottom" -msgstr "" +msgstr "> spodek" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438 msgid "Copy my selected elements to the end of the list of merged elements" -msgstr "" +msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 @@ -3487,5 +3927,5 @@ "Copy my selected elements before the first selected element in the list of " "merged elements" -msgstr "" +msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499 @@ -3494,12 +3934,15 @@ "merged elements" msgstr "" +"Kopírovat mé vybrané elementy za vybraný element ze seznamu slučovaných " +"elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529 msgid "Copy their selected element to the start of the list of merged elements" msgstr "" +"Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552 msgid "Copy their selected elements to the end of the list of merged elements" -msgstr "" +msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574 @@ -3508,4 +3951,6 @@ "of merged elements" msgstr "" +"Kopírovat cizí vybrané elementy před vybraný element ze seznamu slučovaných " +"elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604 @@ -3514,25 +3959,26 @@ "merged elements" msgstr "" +"Kopírovat cizí vybrané elementy za vybraný element ze seznamu slučovaných " +"elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "Nahoru" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Posunout vybrané elementy o jednu pozici nahoru" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "Dolu" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "" +msgstr "Posunout vybrané elementy o jednu pozici dolu" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3541,23 +3987,23 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698 msgid "Remove the selected entries from the list of merged elements" -msgstr "" +msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "Blokovat" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765 msgid "Freeze the current list of merged elements" -msgstr "" +msgstr "Blokovat aktuání seznam slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 msgid "Unfreeze" -msgstr "" +msgstr "Odblokovat" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 msgid "Unfreeze the list of merged elements and start merging" -msgstr "" +msgstr "Odblokovat aktuání seznam slučovaných elementů" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 @@ -3566,4 +4012,6 @@ "Click {0} to start merging my and their entries" msgstr "" +"Kliněte {0} pro zahájení slučování mých a cizích " +"položek" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 @@ -3573,4 +4021,6 @@ "html>" msgstr "" +"Kliněte {0} pro dokončení slučování mých a cizích " +"položek" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 @@ -3578,6 +4028,7 @@ msgid "My version ({0} entry)" msgid_plural "My version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Má verze ({0} položka)" +msgstr[1] "Má verze ({0} položky)" +msgstr[2] "Má verze ({0} položek)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815 @@ -3585,6 +4036,7 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Sloučená verze ({0} položka)" +msgstr[1] "Sloučená verze ({0} položky)" +msgstr[2] "Sloučená verze ({0} položek)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818 @@ -3592,6 +4044,7 @@ msgid "Their version ({0} entry)" msgid_plural "Their version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Cizí verze ({0} položka)" +msgstr[1] "Cizí verze ({0} položky)" +msgstr[2] "Cizí verze ({0} položek)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881 @@ -3606,16 +4059,16 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" -msgstr "" +msgstr "parametr '{0}' nesmí být null (prázdný)" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 @@ -3635,5 +4088,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "Bod" #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 @@ -3642,31 +4095,31 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +msgstr "neočekávaný index sloupce. Zadáno {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" "An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +msgstr "Komunikace se serverem selhala" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +msgstr "Ano, obnovit je také" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Ne, zruš operaci" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3674,10 +4127,12 @@ "the server.

Do you want to undelete these nodes too?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +"Je zde dalších {0} bodů použitých v cestě {1}
které byly smazány na " +"serveru.

Chcete obnovit také tyto body?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +msgstr "Obnovit další body?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3686,105 +4141,109 @@ "" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +"Je zde dalších {0} prvků na něž odkazuje relace {1}
a jsou smazány " +"na serveru.

Chcete je obnovit také?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +msgstr "Obnovit závislé prvky?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " "elements when merge decisions are applied." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +"Vlastnosti slučovaného prvku. Nahradí vlastnosti v mých prvcích pokud bude " +"sloučení aplikováno." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +msgstr "Souřadnice:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +msgstr "Stav smazáno:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +msgstr "Stav viditelné:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +msgstr "(žádný)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "smazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +msgstr "nesmazáno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +msgstr "viditelný (na serveru)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +msgstr "neviditelný (na serveru)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +msgstr "Ponechat klon lokální verze" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +msgstr "Fyzicky odstranit z lokální datové sady" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +msgstr "Ponechat mé souřadnice" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +msgstr "Ponechat cizí souřadnice" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +msgstr "Nerozhodnutý konflikt rozdílných souřadnic" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +msgstr "Ponechat můj stav vymazáno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +msgstr "Ponechat cizí stav vymazáno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +msgstr "Nerozhodnutý konflikt stavu vymazáno" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +msgstr "Ponechat můj stav viditelné" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +msgstr "Ano, resetovat id" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +msgstr "Ne, zrušit" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3793,16 +4252,19 @@ "agree?" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +"Pro ponechání vaší lokální verze, JOSM
resetuje id {0} {1} na 0." +"
Při přístí aktualizaci na server bude přidělěno
nové id." +"
Souhlasíte s tím?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" -msgstr "" +msgstr "Resetovat id na 0" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608 msgid "Keep their visible state" -msgstr "" +msgstr "Ponechat cizí stav viditelné" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623 msgid "Yes, purge it" -msgstr "" +msgstr "Ano, vyčistit to" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628 @@ -3812,17 +4274,18 @@ "dataset.
Do you agree?" msgstr "" +"JOSM odstraní lokální prvek s id {0}
z datové sady.
Souhlasíte?" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633 msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +msgstr "Odstranit z datové sady" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" -msgstr "" - -#. setting up the member table +msgstr "Nerozhodnutý konflikt stavu viditelné" + #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3832,9 +4295,9 @@ #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25 msgid "Primitive" -msgstr "" +msgstr "Prvek" #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124 msgid "merged nodes not frozen yet. Can't build resolution command" -msgstr "" +msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37 @@ -3849,5 +4312,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 @@ -3857,5 +4320,5 @@ #, java-format msgid "The merged dataset will not include a tag with key {0}" -msgstr "" +msgstr "Sloučená datová sada nebude obsahovat tag s klíčem {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 @@ -3863,14 +4326,14 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "" +msgstr "Má datová sada neobsahuje tag s klíčem {0}" #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3879,10 +4342,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3891,7 +4354,7 @@ msgstr "Hodnota" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" -msgstr "" +msgstr "nelze aplikovat nerozhodnutou položku slučování tagů" #. should not happen, but just in case @@ -3899,34 +4362,34 @@ #, java-format msgid "Parameter 'col' must be 0 or 1. Got {0}" -msgstr "" +msgstr "Parametr 'col' musí být 0 nebo 1. Zadáno {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126 msgid "My version (local dataset)" -msgstr "" +msgstr "Má verze (lokální datová sada)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149 msgid "Their version (server dataset)" -msgstr "" +msgstr "Cizí verze (serverová datová sada)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286 msgid ">" -msgstr "" +msgstr ">" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" +msgstr "Ponechat vybrané páry klíč/hodnota z lokální datové sady" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" +msgstr "Ponechat vybrané páry klíč/hodnota ze serverové datové sady" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 msgid "Undecide" -msgstr "" +msgstr "Nerozhodnuto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "Označit vybrané tagy jako nerozhodnuté" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48 @@ -3934,5 +4397,5 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Cizí datová sada neobsahuje tag s klíčem {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -3949,9 +4412,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3959,5 +4422,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3989,42 +4452,63 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "Zrušit řešení konfliktu a zavřít dialog" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +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 +msgid "Apply Resolution" +msgstr "Aplikovat řešení" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Přesto pokračovat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "Pokračovat v řešení" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format +msgid "" +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" +"Nedokončil jste řešení všech konfliktů.
Kliněte {0} pro aplikování již vyřešených konfliktů.
Zbývající konflikty " +"můžete vyřešit později.
Klikněte {1} pro návrat k řešení " +"konfliktů." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +msgid "Conflict not resolved completely" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 msgid "Resolve conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +msgstr "Vyřešit konflikty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Vyřešte konflikt verzí mezi {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4040,98 +4524,132 @@ #, java-format msgid "Failed to load history from the server. Details:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +msgstr "Položka historie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +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 "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +msgstr "Nahrávám historii pro {0} s id {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +msgstr "Zobrazit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +msgstr "Zobrazit historii vybraného prvku" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Vrstvy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Smazat označenou vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Jsou zde neuložené změny. Přesto smazat vrstvu?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Smazat vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Opravdu chcete smazat celou vrstvu?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ano" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Smazat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Smazat {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Zobrazit/Skrýt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Přepnout viditelnost zvolené vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Zobrazit/Skrýt Text/Ikony" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Přepnout viditelnost textu značek a ikon." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Vrstvy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "soukromý" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Smazat označenou vrstvu." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Spojit vrstvy pod označenou" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Přesunout zvolenou vrstvu o řádek dolů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Spojit vrstvy pod označenou" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Vrstvy: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Informační nástěnka" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4141,22 +4659,28 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Prázdná hodnota smaže klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Změnit hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4166,84 +4690,89 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Prosím zvolte klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Vlastnosti/Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Vlastnosti pro zvolené objekty" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Změnit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Opravdu smazat výběr z relace {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Přidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Smazat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Smaže zvolený klíč ve všech objektech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Členství: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Vlastnosti / Členství" @@ -4252,63 +4781,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Otevřít seznam všech relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relace: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Otevřít editor pro zvolenou relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Smazat vybrané relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relace: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Otevřít editor pro zvolenou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Smazat vybrané relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Současný výběr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Otevřít okno s výběrem." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Přiblížit na zvolené prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Obnovit výběr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Přiblížit na výběr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Výběr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4318,5 +4849,5 @@ msgstr[2] "{0} cest" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4326,5 +4857,5 @@ msgstr[2] "{0} relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4335,5 +4866,10 @@ msgstr "Vytrhnout panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4342,143 +4878,413 @@ "nástrojů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Minimalizovat nebo maximalizovat obsah panelu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autoři" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Otevřít seznam lidí, kteří pracuji na zvoleném objektu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autoři: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Stáhnout členy relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Stáhnout plochu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Smazat vybrané relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Nahrát viditelné dlaždice" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Konflikty v datech" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Nevybrána žádná relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Stahuji Plugin {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "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:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Prvek odstraněn z relací" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Nepodařilo se aktualizovat vybraná primitiva," + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Přesunout zvolené prvky nahoru" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Přesunout zvolenou vrstvu o řádek dolů." + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Odebere všechny označené objekty z relace" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Smazat vybrané relace" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Pokračovat v řešení" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konflikty v datech" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Uložit aktuální data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Stáhnout prvky" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Ano, vyčistit to" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Potvrdit akci dálkového ovládání" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Oddálit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Přesunout zvolenou vrstvu o řádek dolů." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Aplikovat změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Základní" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Obsazeno" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Posunout nahoru" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Přesunout zvolené prvky nahoru" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Přidat vybrané" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Přidat všechny zvolené objekty mezi prvky" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Odebrat označené" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Odebere všechny označené objekty z relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Posunout dolů" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Přesunout zvolenou vrstvu o řádek dolů." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Stáhnout prvky" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor relací: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Vytvořit novou relaci ve vrstvě \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Upravit novou relaci ve vrstvě \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Upravit relaci #{0} ve vrstvě \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Nahrát výběr" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4488,5 +5294,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4497,26 +5303,22 @@ msgstr[2] "Odstranit staré klíče z {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Upravit vlastnosti {0} objektů" -msgstr[1] "Upravit vlastnosti {0} objektu" -msgstr[2] "Upravit vlastnosti {0} objektů" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Prosím zadejte nejdříve pozadovanou pozici" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Prosím zadejte jméno umístění" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Změnit umístění" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Nejdříve zvolte záložku" @@ -4549,34 +5351,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Zdroje a typy dat" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Uložit jako novou vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Stáhnout plochu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Stahovaná plocha je moc velká, server zřejmě odmítne váš požadavek" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Stahovaná plocha je v pořádku, velikost akceptována serverem" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Prosím, zadejte hledaný řetězec" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Nemohu načíst výsledky hledání ze serveru" @@ -4584,5 +5386,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Zadej jméno místa které chceš najít:" @@ -4590,5 +5392,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4596,6 +5398,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "jméno" @@ -4634,6 +5436,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4656,15 +5458,15 @@ msgstr "typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "poblíž" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "Zvětšení" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4672,6 +5474,9 @@ "Click." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +"Zvětšení: Kolečko myši, dvojklik nebo Ctrl + Up/Down Posun mapy: Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. Výběr: Klik." + +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Aktuální mapa" @@ -4701,9 +5506,15 @@ #, java-format msgid "History for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +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 msgid "Close the dialog" -msgstr "" +msgstr "Zavřít dialog" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 @@ -4734,5 +5545,5 @@ #, java-format msgid "Node {0}" -msgstr "" +msgstr "Bod {0}" #. item "Streets/Motorway" text "Reference" @@ -5443,5 +6254,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5598,69 +6409,71 @@ "{2}" msgstr "" +"Verze {0} vytvořená na {1} " +"uživatelem {2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format msgid "Version {0} created on {1} by {2}" -msgstr "" +msgstr "Verze {0} vytvořená na {1} uživatelem {2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 msgid "Version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +msgstr "Verze" + +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Obrázky pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Číst GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Žádný čas pro bod {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Čtu {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Obrázky s GPS souřadnicemi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Start GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "nynější odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "rozdíl časových pásem: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5669,138 +6482,128 @@ msgstr[2] "obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synchronizovat hodiny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Data v souboru \"{0}\" nemohla být parsována." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V souboru \"{0}\" není časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Obrázek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizace času s GPS přijímačem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Zadaný čas nemůže být rozparsován" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps bod" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Přizpůsobit kreslení linií" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Použít globální nastavení." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Kreslit spojnice mezi body v této vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Nereslit spojnice mezi body v této vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Přizpůsobit barvu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Výchozí" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Zvolit barvu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Značky z pojmenovaných bodů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Pojmenované body z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importovat zvuk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave Audiosoubory (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Audio značky z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importovat obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5810,5 +6613,5 @@ msgstr[2] "{0} cesty, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5818,5 +6621,5 @@ msgstr[2] "{0} trasy, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5826,30 +6629,30 @@ msgstr[2] "{0} značek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Jméno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Časové rozpětí: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Délka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Převést do datové vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5859,43 +6662,43 @@ "
Pokud chcete nahrát trasy, podívejte se tady:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Převedeno z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Stáhnout data z OSM podél této trasy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Stáhnout vše v rozmezí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metrů" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} čtverečních km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5906,9 +6709,9 @@ "pokračovat?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5916,5 +6719,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5924,47 +6727,47 @@ "byly vynechány." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "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:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} smazáno.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +msgstr "nenastaveno" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5990,5 +6793,5 @@ msgstr[2] "trasy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5997,5 +6800,5 @@ msgstr[2] "body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6005,5 +6808,5 @@ msgstr[2] "trasy s {0} body" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6013,5 +6816,5 @@ msgstr[2] "{0} se skládá z {1} tras" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6032,5 +6835,5 @@ msgstr[2] "značky" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6040,29 +6843,29 @@ msgstr[2] "{0} se skládá z {1} značek" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synchronizovat audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Zvuk zesynchronizován na bodu {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Není možno synchronizovat v již přehrávané vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6070,10 +6873,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Zobrazit/Skrýt Text/Ikony" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Přepnout viditelnost textu značek a ikon." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6081,5 +6891,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6087,29 +6897,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Není možné vztvořit novou zvukovou značku" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL bylo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Chyba při zobrazování URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Pokročilé volby" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Ruční nastavení. Používejte s opatrností!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6117,26 +6927,26 @@ msgstr "Hledání: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Nynějsí hodnota je výchozí" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Výchozí hodnota je''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Výchozí hodnota není známa ( ještě nebyla definována )" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Zvolte řádek k editaci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6144,14 +6954,14 @@ msgstr "Nová hodnota pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Zvolte řádek k vymazání" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Zadejte novou dvojici klíč/hodnota" @@ -6274,40 +7084,40 @@ msgstr "Kalibrace nahrávání zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Styl kreslení {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Vybrat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Zvolte barvu pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Nastavit na výchozí hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Nastavit vše na výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Barvy použité různými objekty v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Barvy" @@ -6641,48 +7451,57 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "Použitý styl" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Nastavení dostupných pluginů." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Stáhnout seznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Aktualizovat" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Konfigurovat zařízení..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Prosím, vyberte položku." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Popis symbolu" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Nastavení webů s pluginy" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Nastavení zobrazení" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6690,29 +7509,29 @@ msgstr "Různá nastavení ovlivňující vzhled celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Nastavení připojení" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Nastavení připojení pro OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Nastavení mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Nastavení projekce mapy a interpretace dat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Nastavení zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Nastavení pro přehrávání zvuků a zvukové značky." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Některá nastavení se projeví až po restartování JOSM." @@ -6764,5 +7583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42 msgid "Login name (e-mail) to the OSM account." -msgstr "" +msgstr "Přihlašovací jméno (e-mail) k účtu OSM." #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 @@ -6778,5 +7597,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47 msgid "OSM username (e-mail)" -msgstr "" +msgstr "Uživatelské jméno (e-mail)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49 @@ -6790,4 +7609,7 @@ "URL.
Do not use a valuable Password." msgstr "" +"VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru." +"
Heslo je jako text přenášeno na server a je součástí URL." +"
Nepoužívejte hesla která chcete utajit." #. 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 @@ -6814,59 +7636,61 @@ msgstr "Klávesová zkratka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +msgstr "Krátká popiska: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +msgstr "URL: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +msgstr "Autor: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +msgstr "Webová stránka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgstr "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 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Cesty k ikonám" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Vyberte řádek ke zkopírování." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "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 msgid "Delete the selected source from the list." msgstr "Smazat vybraný zdroj ze seznamu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7034,33 +7858,33 @@ msgstr "Skupiny modifikátorů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Více informací o tomto přednastavení" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Volitelné atributy:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Použít přednastavení \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "uzavřená cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Neznámý typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7071,15 +7895,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekty typu {0} nejsou podporovány." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7090,18 +7914,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -7112,33 +7936,36 @@ msgstr "Skupina přednastavení ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Kontaktuji OSM server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Stahuji body {0} až {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Stahuji OSM data..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, pravděpodobně chybí některé tagy." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Připravuji data..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nemůžu číst \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7146,24 +7973,24 @@ msgstr "GPX soubory" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Značky z {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +msgstr "Soubor \"{0}\" neexistuje" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" -msgstr "" +msgstr "Parsování souboru \"{0}\" selhalo" #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 @@ -7175,11 +8002,31 @@ msgid "no primitive with id {0} in local dataset. Can't infer primitive type" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +"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/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +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 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7187,48 +8034,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 soubory" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Importované souřadnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Poškozené věty: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Chyby v kontrolním součtu: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Neznámé věty: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Nulové souřadnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA import úspěšný" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA import selhal!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7236,16 +8082,18 @@ "{0} to {1}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +"Podporuje protokol verzí 0.5 a 0.6, přičemž server hlásí podporu od {0} do " +"{1}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7253,43 +8101,56 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Otevírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Nahrávám..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Prohledávám adresář {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Kód={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Server odpověděl chybou s kódem {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "OSM soubory komprimované pomocí bzip2" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 msgid "Invalid bz2 file." -msgstr "" +msgstr "poškozený bz2 soubor." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73 @@ -7313,12 +8174,7 @@ msgstr "Přihlásit se" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Přerušuji..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" -msgstr "" +msgstr "OSM soubory komprimované pomocí gzip" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68 @@ -7328,5 +8184,5 @@ #, java-format msgid "mandatory attribute ''{0}'' missing" -msgstr "" +msgstr "povinný atribut ''{0}'' chybí" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74 @@ -7334,4 +8190,5 @@ msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''" msgstr "" +"nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77 @@ -7340,9 +8197,10 @@ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''" msgstr "" +"nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91 #, java-format msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" -msgstr "" +msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94 @@ -7351,4 +8209,5 @@ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" msgstr "" +"nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114 @@ -7357,4 +8216,5 @@ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''" msgstr "" +"nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174 @@ -7364,4 +8224,10 @@ "''{1}''" msgstr "" +"nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, zadáno " +"''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -7369,109 +8235,130 @@ msgstr "Chyba během parsování" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Soubory z OSM serveru" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Neznámá verze" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +msgstr "V OSM datech chybí číslo verze" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Neznámá verze: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Nalezen element mimo cestu." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " má nulový ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Nalezen tag mimo relaci." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +msgstr "Chybí atribut \"ref\" člena relace {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgstr "Chybí atribut \"type\" člena {0} relace {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Nekompletní specifikace s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +"Neplatná hodnota atributu \"version\" v OSM prvku s id {0}, zadáno {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +msgstr "Chybí atribut \"version\" v OSM prvku s id {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Chybí povinný atribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Připravuji OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Neplatné id uzlu" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +msgstr "Stahování historie..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Kontaktuji server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +msgstr "Nepodařilo se navázat spojení s API {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7480,5 +8367,18 @@ "internetu." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), 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 #, java-format msgid "" @@ -7487,16 +8387,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Aktualizuj pluginy" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Stáhnout pluginy" @@ -7513,32 +8408,33 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +msgstr[0] "{0} Plugin byl úspěšně stažen. Prosím restartujte JOSM." +msgstr[1] "{0} Pluginy byly úspěšně staženy. Prosím restartujte JOSM." +msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +msgstr "Stahuji Plugin {0}..." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +msgstr "Přeskočit stahování" + +#: ../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:118 +msgstr "Pro plugin {1} je třeba JOSM verze {0}." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +msgstr "Stáhnout Plugin" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" -msgstr "" +msgstr "Přeskočit stahování" #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18 @@ -7547,34 +8443,32 @@ msgstr "Nastala chyba v pluginu {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Upozornění - bylo vyžádáno nahrání pluginu {0}. Tento plugin už není " "potřebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, 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:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Následující plugin nenalezen:{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Pluginy byly naposledy aktualizovány před {0} dny." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7584,21 +8478,21 @@ "'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Zakázat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Ponechat plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7608,5 +8502,5 @@ "jejich přepsání." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7615,10 +8509,10 @@ "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Dle informací z pluginu je autor {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7626,9 +8520,9 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Chcete plugin zakázat ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7638,27 +8532,23 @@ "programu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Plugin nebylo možné odstranit. Prosíme informujte o tomto problému vývojáře " -"JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informace" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Nenalezeny informace o pluginu" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "není zádný popis" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +msgstr "Více detailů" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7668,13 +8558,18 @@ msgstr[2] "Informace o pluginech staženy z {0} sití" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Nenalezeny informace o pluginu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Všechny nainstalované pluginy jsou aktuální." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7687,9 +8582,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Stáhnout chybějící pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7702,57 +8597,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "neznámý" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verze {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin zahrnut v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Chyba čtení souboru informací o pluginu: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Toto je až za koncem nahrávky" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Chyba přehrávání zvuku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Nedělat nic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Nahlásit chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7766,18 +8639,18 @@ "verzi JOSM, buďte tak laskavi a chybu nahlašte." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Neočekávaná výjimka" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosíme oznamte chybu na {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Popište (detailně) kroky, které vedly k chybě." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7786,17 +8659,33 @@ "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Prosíme, připojte následující informace:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Text již byl zkopírován do schránky.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Znovu nezobrazovat" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7809,5 +8698,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7817,5 +8706,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7826,13 +8715,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Vytvořit mřížku cest" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7840,21 +8744,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Vybrat svě cesty se společným bodem." -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Vybrat dvě cesty a bod" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Vytvořit mřížku cest" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Nahrát trasy" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7862,74 +8766,75 @@ msgstr "Nahrát trasy na server" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Veřejné" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Popis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Prosím zadejte popis vaší trasy" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Prosím zadejte tagy o vaší trase" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Zvolená trasa: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Připojuji se..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Nahrávání přerušeno" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Chyba při nahrávání na server" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Nahrání GPX dat na server proběhlo úspěšně" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Nahrávání selhalo. Server vrátil následující chybu: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Nahrávám GPX trasu: {0}% ({1} z {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Není zadán žádný popisek. Prosíme, zadejte jej." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Není vybrána GPX vrstva. Nelze nahrát trasu na server." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Není zadáno uživatelské jméno." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Není zadáno heslo." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Nahrávám GPX trasu na server" @@ -7963,5 +8868,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 msgid "Center view" -msgstr "" +msgstr "Centrovat pohled" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 @@ -7999,33 +8904,34 @@ msgstr "Jeden z vybraných souborů je prázdný!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Načíst fotografie..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Nemohu najít výchozí cesto pro adresář {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Prohledávám adresář {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Nalezen nulový soubor v adresáři {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Chyba při získávání souborů z adresáře {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Korelovat vůči GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8045,15 +8951,15 @@ msgstr "Soubory GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Soubor {0} je načten pod jménem \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Chyba při parsování {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8065,34 +8971,34 @@ "pásmo
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Čas fotografie (z exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Čas GPS (načten z předchozích fotografií): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/rrrr hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Jsem v časovém pásmu: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Žádné datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Otevřít další fotografie" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronizovat čas z fotografie GPS přijímače" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8102,69 +9008,69 @@ "Prosíme, použijte požadvaný formát" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Neplatné datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX trasa: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Otevřít jinou GPX trasu" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Časové pásmo: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Posun:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "Mohu vyfotit můj GPS přijímač.
Může to pomoci?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Aktualizovat pozici pro: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Všechny obrázky" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Obrázky bez exif pozice" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Neotagované obrázky" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Korelovat obrázky s GPX trasou" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Korelovat" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Auto-odhad" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Měli byste vybrat GPX trasu" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Není vybrána GPX trasa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8175,9 +9081,9 @@ "Očekávaný formát: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Nepatné časové pásmo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8188,65 +9094,65 @@ "Očekávaný formát: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Neplatný posun" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Nalezeno {0} shod s {1} v GPX trase {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Nahrána GPX trasa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Zvolené fotografie neobsahují informace o čase." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Fotografie neobsahují informace o čase" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX trasa neobsahuje časové údaje" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Časová zóna: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minuty: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekundy: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Časový rozdíl {0} dnů)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8254,13 +9160,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Dosazení fotografií do trasy selhalo." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Upravit časovou zónu a posun" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Výchozí hodnoty" @@ -8282,5 +9188,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" @@ -8303,6 +9209,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Neplatné URL." @@ -8476,22 +9382,22 @@ msgstr "Přidat \"source=...\" k objektům?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Stahuji {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Kontaktuji WMS server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Vytvořit budovy" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8499,18 +9405,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Extrahovat SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Vytvořit hranice" @@ -8532,5 +9438,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23 msgid "Download Image from French Cadastre WMS" -msgstr "" +msgstr "Stáhnout obráze z Francouzkého katastrálního WMS" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23 @@ -8553,5 +9459,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19 msgid "Load location from cache (only if cache is enabled)" -msgstr "" +msgstr "Načíst lokaci z cache (pouze pokud je cache povolena)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26 @@ -8580,4 +9486,6 @@ "known by www.cadastre.gouv.fr ." msgstr "" +"Vložte název města nebo obce.
Použijte syntax a interpunkci dle www." +"cadastre.gouv.fr ." #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70 @@ -8622,8 +9530,10 @@ "Select one of them first, then retry" msgstr "" +"Je zobrazena více než jedna WMS vrstva\n" +"Nejdříve vyberte jednu z nich a potom zopakujte" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Prázdná vrstva" @@ -8652,5 +9562,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8661,14 +9571,14 @@ "Vytvořte nový soubor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Chyba formátu cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Chyba Lambertovy zóny v cache" @@ -8710,9 +9620,9 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Split area" -msgstr "" +msgstr "Rozdělit oblast" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Rozdělit oblast pomocí neotagované cesty" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -8722,24 +9632,26 @@ "Remove the area from the relation before splitting it." msgstr "" +"Zvolená oblast nemůže být rozdělena, protože je členem relace.\n" +"Odstraňte oblast z relace před rozdělením." #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 msgid "TangoGPS Files (*.log)" -msgstr "" +msgstr "Soubory TangoGPS (*.log)" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Format errors: " -msgstr "" +msgstr "Chyby fomátu: " #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112 msgid "TangoGPS import success" -msgstr "" +msgstr "Import TangoGPS úspěšný" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114 msgid "TangoGPS import faliure!" -msgstr "" +msgstr "Import TangoGPS selhal!" #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "TCX Soubory (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8756,4 +9668,9 @@ msgstr "Vytvořit duplikát cesty" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Nebyla načtena žádná data." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8764,11 +9681,11 @@ msgstr "Vytvořit duplikát cesty" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Vrstva pro editaci GPX tras" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" -msgstr "" +msgstr "Konvertovat do GPX vrstvy s anonymizací času" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 @@ -8778,5 +9695,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 msgid "EditGpx" -msgstr "" +msgstr "UpravitGpx" #. TODO what is icon at the end? @@ -8851,5 +9768,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307 msgid "Unknown logFormat" -msgstr "" +msgstr "Neznámý formát logu" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86 @@ -8887,30 +9804,30 @@ msgstr "smazat data po importu" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importovat data ze zařízení." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importuji data z DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Chyb při mazání dat." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "importovaná data z {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Nenalezena žádná data na zařízení." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Spojení selhalo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8922,14 +9839,14 @@ "import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat Import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Importovat data z Globalsat Datalogger DG100 do GPX vrstvy." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Import" @@ -8945,5 +9862,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:199 msgid "World" -msgstr "" +msgstr "Svět" #: ../plugins/grid/src/grid/GridLayer.java:200 @@ -8953,5 +9870,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:222 msgid "Grid layer:" -msgstr "" +msgstr "Vrstva mřížky:" #: ../plugins/grid/src/grid/GridPlugin.java:27 @@ -9020,40 +9937,40 @@ msgstr "Otevře obrázek s ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Počáteční poloha se nachází mimo bbox" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Hledám pobřeží..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "Zatím {0} uzlů..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Chyba při vytváření cache adresáře: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Stopování" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "kontroluji cache..." @@ -9062,26 +9979,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Spouštím redukci vertexů..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Spouštím aproximaci Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Odstraňuji duplicitní uzly..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker trasování" @@ -9089,5 +9998,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10 msgid "An unknown error has occurred" -msgstr "" +msgstr "Došlo k neznámé chybě" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -9166,7 +10075,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "voda" @@ -9288,5 +10197,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77 msgid "Direction to search for land. Default east." -msgstr "" +msgstr "Směr hledání země. Standardně východ." #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 @@ -9323,9 +10232,9 @@ msgstr "Nastavení pluginu Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Stahuji dlaždici..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Nemohu získat obrázek" @@ -9383,5 +10292,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 msgid "Capture GPS Track" -msgstr "" +msgstr "Nahrát GPS záznam" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41 @@ -9481,8 +10390,11 @@ "new server? (Strongly recommended)" msgstr "" +"Plugin openstreetbus používá starý server na appspot.com.
Nový " +"server je dostupný na schokokeks.org.
Chcete změnit nastavení serveru na " +"nový? (Velice doporučujeme)" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100 msgid "Switch to new openstreetbugs server?" -msgstr "" +msgstr "Přepnout na nový openstreetbugs server?" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51 @@ -9516,5 +10428,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97 msgid "Opens the OpenStreetBugs window and activates the automatic download" -msgstr "" +msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125 @@ -9548,4 +10460,6 @@ "comment:" msgstr "" +"Opravdu označit tuto chybu ''vyřešeno''?

Můžete přidat " +"volitelný komentář:" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 @@ -9569,18 +10483,18 @@ msgstr "Neznámý stav problému" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Otevřít viditelné..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Otevřít pouze soubory, které jsou viditelné v tomto pohledu." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9607,33 +10521,33 @@ msgstr "Spustitelný soubor Firefoxu" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "nahrání dat z API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "změna výběru" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "změna pohledu" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "potvrzovat ručně všechny akce Dálkového ovládání" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Plugin umožňující ovládání JOSM z jiných aplikací." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Dálkové ovládání" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Nastavení pro plugin \"Remote Control\"" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9645,28 +10559,28 @@ "využívající tento plugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Povolené akce" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Detaily požadavku: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Chcete toto povolit?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Potvrdit akci dálkového ovládání" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:" @@ -9675,13 +10589,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Upravit relaci" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Upravit relace" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Nevybrána žádná relace" #. Add menu @@ -9695,5 +10609,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 msgid "Routing" -msgstr "" +msgstr "Navigace" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73 @@ -9711,17 +10625,17 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68 msgid "Open a list of routing nodes" -msgstr "" +msgstr "Otevřít seznam navigačních bodů" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77 msgid "Add routing layer" -msgstr "" +msgstr "Přidat navigační vrstvu" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88 msgid "Criteria" -msgstr "" +msgstr "Kritérium" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90 msgid "Shortest" -msgstr "" +msgstr "Nejkratší" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113 @@ -9795,5 +10709,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "obrázek " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9933,4 +10847,26 @@ msgstr "Výška" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Upravit vlastnosti {0} objektů" +msgstr[1] "Upravit vlastnosti {0} objektu" +msgstr[2] "Upravit vlastnosti {0} objektů" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -9955,5 +10891,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "neočekávané číslo sloupce {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -10126,5 +11062,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203 msgid "Added node on all intersections" -msgstr "" +msgstr "Přidány body na všechny průsečíky" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227 @@ -10138,9 +11074,9 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237 msgid "Joined self-overlapping area" -msgstr "" +msgstr "Spojena plocha překrývající sama sebe" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238 msgid "Joined overlapping areas" -msgstr "" +msgstr "Spojeny překrývající se plochy" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242 @@ -10158,21 +11094,21 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465 msgid "Removed Element from Relations" -msgstr "" +msgstr "Prvek odstraněn z relací" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574 msgid "Join Areas: Remove Short Ways" -msgstr "" +msgstr "Spojit plochy: Vymazat krátké cesty" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590 msgid "Closed Way" -msgstr "" +msgstr "Uzavřená cesta" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857 msgid "Remove tags from inner ways" -msgstr "" +msgstr "Odstranit tagy z vnitřních cest" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886 msgid "Join Areas Function" -msgstr "" +msgstr "Funkce spojení ploch" #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31 @@ -10184,33 +11120,33 @@ msgstr "Otevře dialog umožňující skočit na zadané místo" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Zadejte šířku/délku místa kam skočit." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Můžete též vložit URL z www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Přiblížení (v metrech)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Skočit tam" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Skok na místo" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Nelze rozpoznat šířku/délku" @@ -10243,6 +11179,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Chyby kontroly" @@ -10252,10 +11188,10 @@ msgstr "Žádné chyby při kontrole" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Mřížka" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10344,23 +11280,15 @@ msgstr "Provede kontrolu dat" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Data mají chyby. Přesto nahrát?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Otevřít okno s výsledkem kontroly." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Přiblížit na problém" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Ověřit" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Ověřit buď aktuální výběr, nebo kompletní data." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10433,22 +11361,22 @@ msgstr "Zkřížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Duplicitní uzly" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Duplikované uzly v cestě." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Zkontroluje cesty jestli neobsahují identické uzly za sebou." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Duplicitní uzly v cestě" @@ -10525,23 +11453,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:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Kontrola vlastností :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10552,7 +11480,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Neplatná kombinace klíče/hodnoty" @@ -10560,78 +11488,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problém s vykreslováním" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Klíč ''{0}'' je neplatný." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Klíče s prázdnými hodnotami" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Neplatné klíče vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Neplatná mezera v klíči vlastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Hodnota začíná nebo končí mezerou" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Hodnota obsahuje HTML entitu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Kontrola klíčů vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Kontroluje platnost klíčů vlastností proti seznamu slov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Použít komplexní kontrolu vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10639,82 +11569,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Přidat nový zdroj do seznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Upravit zvolený zdroj." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Zdroje dat" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Kontrola hodnot vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Zkontrolovat tagy s FIXME." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +msgstr "Použít stadardní datový soubor." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +msgstr "Použít standardní datový soubor (doporučeno)." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Opravit vlastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Nelze najít typ elementu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Nelze najít úroveň varování" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Neplatný výraz ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10861,7 +11791,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "budova" @@ -10875,5 +11805,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "oblast" @@ -10907,10 +11837,10 @@ msgstr "Spojený koncový uzel cest poblíž jiné cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Neotagované a nespojené uzly." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty." @@ -10964,8 +11894,32 @@ msgstr "Obrácená země: země není na levé straně" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10976,10 +11930,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11023,4 +11977,26 @@ "use." msgstr "" +"Přidávat upravovat a mazat položky WMS pluginu můžete na záložce nastavení - " +"položky se následně zobrazí v menu WMS.\n" +"\n" +"Totéž můžete také udělat v pokročilých volbách za použití následujícího " +"schema:\n" +"wmsplugin.url.1.name=Landsat\n" +"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +"wmsplugin.url.2.name=NPE Maps... atd\n" +"\n" +"Příklad kompletního URL WMS (landsat)\n" +"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +"\n" +"Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , " +"potřebujete zadat pouze odpovídající 'id'.\n" +"Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL jako v " +"příkladu a 73 nahraďte id vašeho obrázku:\n" +"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +"\n" +"Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně šiřitelný), " +"pokud si nejste jisti, nepoužívejte jej." #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53 @@ -11028,17 +12004,17 @@ msgstr "Nápověda pluginu WMS Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Zaměřený obrázek..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" -msgstr "" +msgstr "WMS: {0}" #. This service serves the purpose of "just this once" without forcing the user @@ -11046,26 +12022,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +msgstr "Vlastní WMS Link" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +msgstr "Podporované zdroje k překreslování:" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +msgstr "Navštívit domovskou stránku" + +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +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 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11073,7 +12049,7 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" -msgstr "" +msgstr "Neplatná URL WMS nebo id" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28 @@ -11081,5 +12057,5 @@ msgstr "Upravit pozici zvolené WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11090,19 +12066,19 @@ "Toto může vést ke špatným souřadnicím." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatické stahování" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), stahování v přiblížení {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11110,88 +12086,88 @@ "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:231 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +msgstr "Uložit WMS vrstvu" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +msgstr "Načíst vrstvu WMS" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, 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:337 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Nastavení pluginu WMS Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Jméno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Jméno v menu (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (výchozí)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Zadejte jméno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Zkopírovat výchozí" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11231,5 +12207,5 @@ #: build/specialmessages.java:10 msgid "Audio Device Unavailable" -msgstr "" +msgstr "Audio zařízení je nedostupné" #. Java message loading audio data @@ -11273,10 +12249,10 @@ msgid "" "Creating and handling address nodes and buildings within Czech Republic." -msgstr "" +msgstr "Vytváření a správa adresních bodů a budov v rámci České Republiky." #. Plugin dataimport #: build/trans_plugins.java:13 msgid "Allows to import various file formats into JOSM directly." -msgstr "" +msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM." #. Plugin DirectUpload @@ -11300,4 +12276,6 @@ "very fast." msgstr "" +"Umožňuje uživateli anonymizovat čas a velice rychle smazat části rozsáhlých " +"GPX záznamů." #. Plugin globalsat @@ -11306,11 +12284,16 @@ msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" -msgstr "" +msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11320,5 +12303,5 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" @@ -11327,5 +12310,5 @@ #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11334,5 +12317,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11340,7 +12323,10 @@ "paths (which also can be imported from a gps layer)." msgstr "" +"Poskytuje měřící dialog a vrstvu pro měření délek a úhlů segmentů, ploch " +"uzavřených jednoduchou cestou a vytváření měřících cest (které je možné " +"importovat z gps vrstvy)." #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11348,17 +12334,20 @@ "mouse moving (general Java - tablet problem)." msgstr "" +"Simuluje kliknutí pokud uděláte malý a krátký pohyb. Užitečné pro tablety, " +"pokud máte problémy, stačí kliknout na tablet bez pohybu myší (obecný Java - " +"tablet problém)." #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" -msgstr "" +msgstr "Zobrazuje na pozadí obrázek z OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje problémy z OpenStreetBugs." #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11367,5 +12356,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11374,51 +12363,57 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " "align it with the map." msgstr "" +"Tento plugin umožňuje zobrazit libovolný obrázek na pozadí editoru a " +"ztotožnit jej s mapou." #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Umožní jiné aplikace posílat příkazy do JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " "defined in routes.xml file in plugin directory" msgstr "" +"Vykresluje cesty (autobusy, turistika, cyklistika, ...). Cesty musí být " +"definovány v souboru routes.xml v adresáři pluginů." #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Poskytuje směrování" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " "background and request updates." msgstr "" +"Zobrazuje slippy map mřížku v JOSM. Můžete nahrát dlaždice ze slippy map " +"jako pozadí a požadovat aktualizace." #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Umožní přidat ukazatele/body na současnou GPS polohu." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Poskytuje dialog umožňující editovat tagy v tabulce." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11428,10 +12423,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Vytváření řadových domků z jednotlivých bloků." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11442,5 +12437,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11451,5 +12446,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11459,11 +12454,18 @@ "provádí opravy. Zahrnuje kontrolu překlepů pro tagy." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" -msgstr "" +msgstr "Snadné stahovaní velmi dlouhých propojených cest" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11932,5 +12934,5 @@ #: build/trans_presets.java:145 build/trans_presets.java:161 msgid "Motorroad" -msgstr "" +msgstr "Silnice pro motorová vozidla" #. item "Streets/Trunk" check "Embankment" @@ -12619,58 +13621,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12684,6 +13634,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "dálnice" @@ -12709,6 +13659,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "4. pruhová silnice" @@ -12734,6 +13684,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "silnice první třídy" @@ -12759,6 +13709,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "silnice druhé třídy" @@ -12772,5 +13722,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "silnice třetí třídy" @@ -12788,5 +13738,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "obytná oblast" @@ -12820,6 +13770,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "obslužná cesta" @@ -12846,6 +13796,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "konstrukce" @@ -12895,5 +13845,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "kruhový objezd" @@ -12982,5 +13932,5 @@ #: build/trans_presets.java:522 build/trans_presets.java:543 msgid "concrete" -msgstr "" +msgstr "beton" #: build/trans_presets.java:522 build/trans_presets.java:564 @@ -13872,5 +14822,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "mokřina" @@ -15601,27 +16551,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18460,7 +19410,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bicykl" @@ -18530,7 +19480,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "pěší" @@ -18556,5 +19506,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -19045,13 +19995,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "zastaralý" @@ -19093,5 +20043,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "koňská" @@ -19311,4 +20261,66 @@ msgstr "překážka" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Silnice pro motorová vozidla" + #. color tertiary #. @@ -19343,6 +20355,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "ulice" @@ -19398,7 +20410,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "dálnice" @@ -19454,8 +20466,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "železnice" @@ -19476,5 +20488,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19488,5 +20500,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "brod" @@ -19507,5 +20519,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19520,5 +20532,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19533,5 +20545,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "říční břeh" @@ -19545,5 +20557,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "potok" @@ -19557,5 +20569,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19583,7 +20595,7 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" -msgstr "" +msgstr "akvadukt" #. color aqueduct @@ -19749,13 +20761,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19817,7 +20829,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19840,10 +20852,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19879,7 +20891,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19924,6 +20936,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19937,5 +20949,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminál" @@ -19957,5 +20969,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19969,5 +20981,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -20015,7 +21027,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "lanovka" @@ -20032,5 +21044,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "lehká sjezdovka" @@ -20045,5 +21057,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "střední sjezdovka" @@ -20058,5 +21070,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "těžká sjezdovka" @@ -20071,5 +21083,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20084,5 +21096,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20097,5 +21109,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "sjezdovka pro začátečníky" @@ -20200,10 +21212,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20217,5 +21229,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "molo" @@ -20229,5 +21241,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "potrubí" @@ -20355,12 +21367,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20374,5 +21386,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "přísav" @@ -20444,8 +21456,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "občanská vybavenost" @@ -20547,10 +21559,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20936,22 +21948,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20983,6 +21995,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "menší vodní plochy" @@ -21043,8 +22055,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "zdravotnictví" @@ -21397,26 +22409,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "obchod" @@ -21488,8 +22500,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21639,9 +22651,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turistika" @@ -21713,8 +22725,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historické" @@ -21785,8 +22797,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "zeleň" @@ -21800,5 +22812,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "lom" @@ -21812,5 +22824,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "skládka" @@ -21832,5 +22844,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "nádrže" @@ -21844,5 +22856,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "les" @@ -21856,5 +22868,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "zemědělství" @@ -21877,5 +22889,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "obchody" @@ -21889,5 +22901,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "průmysl" @@ -21901,5 +22913,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "stará zátěž, městské ruiny (Brownfield)" @@ -21913,5 +22925,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "Zastavitelné území (Greenfield)" @@ -21925,5 +22937,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "železniční plochy" @@ -21980,7 +22992,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "vojenský" @@ -21994,5 +23006,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "hřbitov" @@ -22005,5 +23017,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "vrchol" @@ -22018,5 +23030,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ledovec" @@ -22030,5 +23042,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "sopka" @@ -22083,8 +23095,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "přírodní" @@ -22098,5 +23110,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "křoví" @@ -22110,5 +23122,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "vřesoviště" @@ -22122,5 +23134,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "Prales" @@ -22134,5 +23146,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "bahno" @@ -22146,5 +23158,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "pláž" @@ -22222,8 +23234,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "cesta" @@ -22271,7 +23283,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "hranice" @@ -22413,10 +23425,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "místo" @@ -22464,6 +23476,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adresa" @@ -22760,24 +23772,152 @@ msgstr "" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Selhala inicializace API, prosím zkuste to znovu později." + +#~ msgid "API initialization failed" +#~ msgstr "Selhala inicializace API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou " +#~ "vrstvu?" + +#~ msgid "No data" +#~ msgstr "Žádná data" + +#~ msgid "Update failed" +#~ msgstr "Aktualizace selhala" + +#~ msgid "Missing primitive" +#~ msgstr "Chybějící prvek" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Aplikovat částečná řešení" + +#~ msgid "Layers: {0}" +#~ msgstr "Vrstvy: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému " +#~ "vývojáře JOSM." + +#~ msgid "Validate" +#~ msgstr "Ověřit" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data." + +#~ msgid "Email" +#~ msgstr "E-mail" + #~ msgid "Data Layer" #~ msgstr "Vrstva dat" -#~ msgid "Uploading data" -#~ msgstr "Nahrávám data" +#~ msgid "unnamed" +#~ msgstr "nepojmenováno" + +#~ msgid "Change" +#~ msgstr "Změnit" + +#~ msgid "Rotate" +#~ msgstr "Otočit" + +#~ msgid "false" +#~ msgstr "nepravda" + +#~ msgid "true" +#~ msgstr "pravda" + +#~ msgid "different" +#~ msgstr "různé" + +#~ msgid "position" +#~ msgstr "pozice" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "their version:" +#~ msgstr "verze na serveru:" + +#~ msgid "resolved version:" +#~ msgstr "finální verze:" + +#~ msgid "my version:" +#~ msgstr "moje verze:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Revert" +#~ msgstr "Vrátit zpět" #~ msgid "Not implemented yet." #~ msgstr "Zatím neimplementováno." -#~ msgid "Email" -#~ msgstr "E-mail" +#~ msgid "Add Selected" +#~ msgstr "Přidat vybrané" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemohu se připojit na server." + +#~ msgid "There were conflicts during import." +#~ msgstr "Vznikly konflikty během importu" + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsování odezvy serveru" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontaktuji OSM server..." #~ msgid "Resolve Conflicts" #~ msgstr "Vyřešit konflikty" -#~ msgid "There were conflicts during import." -#~ msgstr "Vznikly konflikty během importu" - -#~ msgid "Object" -#~ msgstr "Objekt" +#~ msgid "OSM username (email)" +#~ msgstr "OSM uživatelské jméno (email)" + +#~ msgid "Aborting..." +#~ msgstr "Přerušuji..." + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Upravit pozici WMS vrstvy" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Přihlašovací jméno (email) k OSM účtu." + +#~ 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 "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME oprava)" #~ msgid "{0} object has conflicts:" @@ -22786,82 +23926,4 @@ #~ msgstr[1] "{0} objekty mají konflikty:" #~ msgstr[2] "{0} objektů má konflikty:" - -#~ msgid "my version:" -#~ msgstr "moje verze:" - -#~ msgid "their version:" -#~ msgstr "verze na serveru:" - -#~ msgid "resolved version:" -#~ msgstr "finální verze:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Přihlašovací jméno (email) k OSM účtu." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM uživatelské jméno (email)" - -#~ msgid "Unknown host" -#~ msgstr "Neznámé jméno počítače" - -#~ msgid "position" -#~ msgstr "pozice" - -#~ msgid "different" -#~ msgstr "různé" - -#~ msgid "true" -#~ msgstr "pravda" - -#~ msgid "false" -#~ msgstr "nepravda" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Vyřešit {0} konfliktů v {1} objektech" - -#~ msgid "Change" -#~ msgstr "Změnit" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu" - -#~ msgid "Revert" -#~ msgstr "Vrátit zpět" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." - -#~ msgid "Rotate" -#~ msgstr "Otočit" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tagy (prázdná hodnota vymaže tag)" - -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsování odezvy serveru" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemohu se připojit na server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." - -#~ msgid "Tagging preset source" -#~ msgstr "Zdroj přednastavených tagů" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam." - -#~ msgid "Tagging preset sources" -#~ msgstr "Zdroje přednastavení tagů" #~ msgid "" @@ -22872,6 +23934,18 @@ #~ "zmenšit oblast." -#~ msgid "Commit comment" -#~ msgstr "Poslat komentář" +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Chyba při mazání souboru pluginu: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin již existuje" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Nemohu stáhnout plugin: {0} z {1}" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22881,80 +23955,12 @@ #~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM." -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Nemohu stáhnout plugin: {0} z {1}" - -#~ msgid "image not loaded" -#~ msgstr "obrázek nebyl nahrán" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé " -#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Upravit pozici WMS vrstvy" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME oprava)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Server nepodporuje sady změn" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin již existuje" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Chyba při mazání souboru pluginu: {0}" +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Některé z uzlů jsou (skoro) v přímce" - -#~ msgid "Drawbridge" -#~ msgstr "Padací most" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Opravdu označit tento problém jako \"hotový\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Importovat TCX soubor..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importovat TCX soubor jako GPS trasu" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s " -#~ "nastavením.
Heslo je na server posíláno nezašifrované, zakódované v " -#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" #~ msgid "" @@ -22977,4 +23983,155 @@ #~ "Nenáhrávejte žádná data po zobrazení této hlášky!" +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Opravdu označit tento problém jako \"hotový\"?" + +#~ msgid "Commit comment" +#~ msgstr "Poslat komentář" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikty: {0}" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importovat TCX soubor jako GPS trasu" + +#~ msgid "Import TCX File..." +#~ msgstr "Importovat TCX soubor..." + +#~ msgid "viaduct" +#~ msgstr "viadukt" + +#~ msgid "Drawbridge" +#~ msgstr "Padací most" + +#~ msgid "Occupied By" +#~ msgstr "Obsazeno" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tagy (prázdná hodnota vymaže tag)" + +#~ msgid "Remove Selected" +#~ msgstr "Odebrat označené" + +#~ msgid "Basic" +#~ msgstr "Základní" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Přidat všechny zvolené objekty mezi prvky" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou " +#~ "{1}" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Nenalezen průsečík. Nic nebylo změněno." + +#~ msgid "sports" +#~ msgstr "Sportovní potřeby" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n" + +#~ msgid "Server does not support changesets" +#~ msgstr "Server nepodporuje sady změn" + +#~ msgid "Tagging preset sources" +#~ msgstr "Zdroje přednastavení tagů" + +#~ msgid "Tagging preset source" +#~ msgstr "Zdroj přednastavených tagů" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam." + +#~ msgid "Delete and Download" +#~ msgstr "Smazat a stáhnout" + +#~ msgid "image not loaded" +#~ msgstr "obrázek nebyl nahrán" + +#~ msgid "Download Image from french Cadastre WMS" +#~ msgstr "Stáhnout obrázek z WMS francouzského katastru" + +#~ msgid "Move Down" +#~ msgstr "Posunout dolů" + +#~ msgid "Move Up" +#~ msgstr "Posunout nahoru" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor relací: {0}" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s " +#~ "nastavením.
Heslo je na server posíláno nezašifrované, zakódované v " +#~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na " +#~ "server mají historii." + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Upravit padací most" + +#~ msgid "Edit Portcullis" +#~ msgstr "Upravit zkratky" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Následující chyby nastaly při hromadném stahování:" + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "" +#~ "Stránka s nápovědou chybí. Udělej jí v angličtině." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Stránka s nápovědou chybí. Udělej jí v angličtině " +#~ "nebo ve tvém jazyce." + +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé " +#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Otevře soubory TCX přímo v JOSM." + +#~ msgid "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." +#~ msgstr "" +#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " +#~ "plugin může být použit pro přípravu tras pro uploud do OSM." + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -22988,50 +24145,4 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikty: {0}" - -#~ msgid "viaduct" -#~ msgstr "viadukt" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování" - -#~ msgid "The projection could not be read from preferences. Using EPSG:4326" -#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326" - -#~ msgid "sports" -#~ msgstr "Sportovní potřeby" - -#~ msgid "Download Image from french Cadastre WMS" -#~ msgstr "Stáhnout obrázek z WMS francouzského katastru" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou " -#~ "{1}" - -#~ msgid "Delete and Download" -#~ msgstr "Smazat a stáhnout" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Nenalezen průsečík. Nic nebylo změněno." - -#~ msgid "Solve Conflict" -#~ msgstr "Vyřešit konfklikt" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na " -#~ "server mají historii." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?" - #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -23041,34 +24152,6 @@ #~ "upravit posuvníky aby byli fotografie dosazeny." -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Následující chyby nastaly při hromadném stahování:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Upravit padací most" - -#~ msgid "Edit Portcullis" -#~ msgstr "Upravit zkratky" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "" -#~ "Stránka s nápovědou chybí. Udělej jí v angličtině." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Stránka s nápovědou chybí. Udělej jí v angličtině " -#~ "nebo ve tvém jazyce." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Otevře soubory TCX přímo v JOSM." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento " -#~ "plugin může být použit pro přípravu tras pro uploud do OSM." +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta" #~ msgid "" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 16826) +++ /applications/editors/josm/i18n/po/da.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:12+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-02 23:02+0000\n" +"Last-Translator: Peter Brodersen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Skaber hovedgrænsefladen" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Ugemte ændringer" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Gem og afslut" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Smid væk og afslut" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Fortryd" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer defekt URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Advarsel" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerer defekt fil-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "UKENDT" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Om" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Vis \"Om\"-billedet." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Seneste ændring ved {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java-version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Hjemmeside" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Fejlrapporter" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Læsmig" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Version" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Bidrag" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licens" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Udvidelser" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Om JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Filen kunne ikke findes." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Advarsel" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +msgstr "Vælg venligst et allerede uploadet punkt, vej eller relation." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Vælg venligst rækken, der skal slettes" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Vælg enten:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Foren punkter" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Tilføj punkt..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "Ret: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Indtast koordinater for nyt punkt." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Brug decimaltal i grader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative værdier angiver vestlig/sydlig halvkugle." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Breddegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Længdegrad" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Opstil punkter i cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Flyt de valgte punkter ind i en cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +489,58 @@ msgstr "Værktøj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Vælg mindst fire punkter." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Stil punkter op på linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Flyt de valgte punkter på linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Vælg venligst mindst tre punkter." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -348,19 +548,13 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +"Det nuværende antal ændringer overskrider det maksimale antal; nuværende er " +"{0}, maksimum er {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Brud på API-egenskaber" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Kunne ikke opstarte API'et. Prøv igen senere." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Opstart af API'et fejlede" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +570,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Brud på forudgående krav" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "valgt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "hent" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zoom til {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom synsfeltet til {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +619,30 @@ msgstr "Vis: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Intet valgt at zoome ind på." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at sammensætte." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Sammensæt veje med forskellige tilhørsforhold?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -458,13 +652,13 @@ "sammensætte dem?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Sammensæt alligevel" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Skift retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -474,10 +668,10 @@ "nogle af dem om?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Vend om og sammensæt" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -485,20 +679,20 @@ msgstr "Indtast værdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Sammensæt {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Alle vejene var tomme" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -517,23 +711,24 @@ msgstr "Kopier valgte objekter til udklipsholderen." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Vælg venligst noget at kopiere." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Opret cirkel" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Opret cirkel ud fra tre valgte punkter." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "De punkter ligger ikke i en cirkel." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -541,87 +736,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Fjern" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Slet valgte objekter." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Overskriv" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Fordel punkter" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Hent kort-data fra OSM serveren." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Hent" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Vælg mindst én opgave til download" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "Henter henvisninger..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Der var {0} konflikter under import." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Fejl ved download" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplikér" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikér det valgte ved kopiering og indsættelse." @@ -641,5 +871,5 @@ msgstr "Afslut programmet." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -649,58 +879,73 @@ "GPL-licensen." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Eksporter til GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Eksporter dataet til GPS-fil." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Intet at eksportere. Hent først noget data." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "parameter \"{0}\" må ikke være null" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "beskrivelse af gps-spor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Angiv forfatter" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Rigtige navn" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Ophavsret (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Forudindstillet" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "År for ophavsret" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Nøgleord" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Eksporter indstillinger" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Eksporter og gem" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -711,25 +956,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Fejl" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Vælg en forudangivet licens" @@ -739,46 +964,49 @@ msgstr "JOSM Online-hjælp" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Åbn i browser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Rediger" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Genindlæs" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Fejl ved indlæsning af siden {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Hjælpesiden mangler. Opret den på engelsk" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -816,30 +1044,40 @@ msgstr "Forbind et punkt til nærmeste stykke vej" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Forbind punkt og linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Ingen genvej" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Sammenflet alligevel" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Flet laget nedenunder sammen med det valgte 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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -849,9 +1087,9 @@ "sammenflette dem?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Sammenflet alligevel" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -859,60 +1097,71 @@ "er i brug." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Foren {0} punkter" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "valgt" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Opdaterer de valgte primitiver fra serveren" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Afspejl" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Afspejl de valgte punkter og veje" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Vælg mindst ét punkt eller vej." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "op" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Flyt objekterne {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "venstre" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "højre" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Flyt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Flytter objekterne {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter ud af verden." @@ -920,5 +1169,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Ny" @@ -928,26 +1177,17 @@ msgstr "Opret et nyt kort." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "unavngivet" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Åbn..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Åbn en fil" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kunne ikke læse \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -976,34 +1216,35 @@ msgstr "Hent URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Gør vinkler rette" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Kun to punkter er tilladt." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Det valgte må kun bestå af veje." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Du benytter EPSG:4326-projiceringen, hvilket kan føre
til uønskede " @@ -1011,9 +1252,9 @@ "projiceringen for at fjerne denne advarsel.
Vil du fortsætte?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Kun et punkt er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Gør vinkler rette" @@ -1029,11 +1270,11 @@ msgstr "Indsæt indhold af udklipsholderen." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Indsæt tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Tilføj tags i udklipsholderen til alle valgte elementer." @@ -1061,16 +1302,21 @@ msgstr "Omgør seneste fortrydelse" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Omdøb lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Omdøb også filen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Kunne ikke omdøbe filen \"{0}\"" @@ -1084,9 +1330,9 @@ msgstr "Vend retningen for alle valgte veje." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Vælg mindst én vej." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Vend veje om" @@ -1094,17 +1340,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Gem" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Gem nuværende data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Filen {0} eksisterer allerede. Overskriv?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1114,25 +1362,25 @@ "venligst dette som en fejl." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Intet dokument er åbent, så der er intet at gemme." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dette dokument indeholder intet data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Gem alligevel" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1142,54 +1390,75 @@ "håndteret som om, du afviste dem alle. Fortsæt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Afvis konflikter og gem" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Gem OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Gem GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Gem lag" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Kunne ikke lave backup af fil." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Ukendt filtype: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "En fejl opstod under skrivning." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "En fejl opstod ved gendannelse af backup-fil." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Ukendt filtype." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "En fejl opstod under skrivning." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "En fejl opstod ved gendannelse af backup-fil." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Gem som..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Gem det nuværende data i en ny fil." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Vælg alt" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1222,16 +1491,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Luk" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Opdel vej" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Opdel en vej ved det valgte punkt" @@ -1241,5 +1510,5 @@ msgstr "Det nuværende valgte kan ikke bruges til opdeling" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1247,5 +1516,5 @@ msgstr[1] "De valgte punkter er ikke i midten af nogen vej." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1259,9 +1528,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:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 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:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1269,10 +1538,10 @@ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Du skal vælge mindst to punkter for at opdele en kredsformig vej" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1282,17 +1551,17 @@ "vejen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1313,46 +1582,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Vælg enten:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Et markeret punkt, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Et punkt, som bruges af mere end én vej, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Et punkt, som bruges af mere end én vej en af disse veje, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1361,5 +1630,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1368,5 +1637,5 @@ "vej." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1376,9 +1645,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1386,5 +1655,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1400,140 +1669,91 @@ msgstr "Fortryd den sidste handling" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Fravælg alt" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Fravælg alle objekter" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Fravælg alt (fokus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Fravælg alt (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Opdater data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Opdaterer det nuværende datalag fra serveren (genhenter data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Opdateringen fejlede" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Intet GPX-datalag blev fundet" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Kunne ikke finde primitiven med id {0} i det nuværende datasæt" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Mangler primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Opdater det valgte" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Opdaterer de valgte primitiver fra serveren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Der er ingen valgte primitiver at opdatere." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Intet er valgt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Send til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Send alle ændringer til OSM-serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Tilføjede objekter:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Ændrede objekter:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Slettede objekter:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Send disse ændringer?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Send ændringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Ingen ændringer at sende." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Sender" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Opdaterer primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synkronisér kun {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synkronisér hele datasættet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1547,17 +1767,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Der er opdaget en konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "uventet svar. Modtog {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1568,56 +1788,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitiven er allerede slettet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Upload til OSM-API'et fejlede" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Opdaterer primitiv" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Send alle ændringer til OSM-serveren." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Kunne ikke oprette forbindelse til OSM-serveren {0}.\n" -"Tjek server-URL'en i dine indstillinger samt din internetforbindelse." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Tilføjede objekter:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Ændrede objekter:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1705,42 +1934,54 @@ msgstr "Langsommere fremad" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Henter GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Hent GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Rå GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Henter data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Intet data importeret." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Henter {0} af {1} ({2} tilbage)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Sender data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Følgende fejl opstod under masse-download:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Fejl ved download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1752,21 +1993,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Slettede eller flyttede primitiver" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Slette-tilstand" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Slet punkter eller veje." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1774,5 +2015,5 @@ msgstr "Tilstand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1782,753 +2023,23 @@ "når en vej slettes. Ctrl: Slet refererende objekter." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Tegn" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Tegn punkter" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Tilstand: Tegn fokus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "valgt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Tilføj punkt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Tilføj punkt inde i vej" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Forbind eksisterende vej til punkt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Opret nyt punkt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Vælg punkt under markøren." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Indsæt nyt punkt i vej." -msgstr[1] "Indsæt nyt punkt i {0} veje." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Start ny vej fra seneste punkt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Fortsæt vej fra seneste punkt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Afslut tegning." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Træk ud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Opret områder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Træk vej ud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Slip museknappen for at vælge objekterne inden i firkanten." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Tegn en firkant af passende størrelse og slip så museknappen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Slip museknappen for at stoppe rotationen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Tegn et vejsegment for at danne et rektangel." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Markering" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Vælg, flyt og rotér objekter" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Tilføj og flyt et virtuelt nyt punkt til vej" -msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Slip museknappen for at stoppe flytningen. Ctrl for at koble sammen med " -"nærmeste punkt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Flyt objekter ved at trække i den; Shift for at tilføje til det valgte (Ctrl " -"for at skifte); Shift-Ctrl for at rotere det valgte; eller skift mellem det " -"valgte" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Forstør" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoom og flyt kort" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Søg..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Søg efter objekter." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Intet data indlæst." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Indtast en søgetekst." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "erstat valgte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "føj til valgte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "fjern fra valgte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "versalfølsom" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regulært udtryk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "Baker Street - 'Baker' og 'Street' i enhver nøgle eller navn." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' i enhver nøgle eller navn." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - intet 'Bak' i navnet." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "Specielle mål:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - alle objekter rettet af bruger" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - objekt med det givne ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - alle ændrede objekter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - alle valgte objekter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - alle ufuldstændige objekter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Brug | eller OR to for at forbinde med et logisk \"eller\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Brug ( og ) for at gruppere udtryk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Søg" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Start søgning" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Intet resultat for \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Fandt {0} resultater" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "Versalfølsom" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "Ikke-versalfølsom" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "Regulært udtryk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Det regulære udtryk \"{0}\" havde en fejl ved tegn {1}; den komplette fejl " -"er:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Mangler argumenter for \"eller\"." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Mangler argument fro \"ikke\"." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Forventede slutparentes." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontakt {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Henter..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Kunne ikke læse fra URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Fortolkningsfejl i URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Fjern \"{0}\" for {1} \"{2}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Sæt {0}={1} for {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekter" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Fjern \"{0}\" for {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Sæt {0}={1} for {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slet {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slet {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Modstridende relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n" -"Slet fra relation?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Slet fra relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Markeringen \"{0}\" bruges af relationen \"{1}\".\n" -"Slet fra relation?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Opdel vejstykke" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du er i gang med at slette punkter uden for området.du har downloadet." -"
Dette kan skabe problemer, fordi andre objekter (som du ikke kan se) " -"måske bruger dem.
Vil du virkelig slette?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Flyt" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "node" -msgstr[1] "noder" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Fjerner 1 primitiv" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Løs {0} tag-konflikter i {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Løs versionskonflikter for {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Løs konflikter i punktlisten for vejen {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Udfør?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Når denne vej bliver vendt om, vil følgende af vejens og punkternes " -"egenskaber foreslås ændret for at opretholde data-ensartethed." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relation" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Gammel rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Ny rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Gammel nøgle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Gammel værdi" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Ny nøgle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Ny værdi" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Udfør valgte ændringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Undlad at udføre ændringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Egenskaber for " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatisk tag-rettelse" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Fejl i konfigurationsfilen ved linjerne {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åbne mappen for indstillinger: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Indstillinger er gemt på {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Kunne ikke sende indstillinger. Årsag: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Kunne ikke hente indstillinger fra serveren." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2540,8 +2051,791 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "parameteren \"{0}\" må ikke være en null-værdi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Tegn" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Tegn punkter" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "valgt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Tilføj punkt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Tilføj punkt inde i vej" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Forbind eksisterende vej til punkt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Opret nyt punkt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Vælg punkt under markøren." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Indsæt nyt punkt i vej." +msgstr[1] "Indsæt nyt punkt i {0} veje." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Start ny vej fra seneste punkt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Fortsæt vej fra seneste punkt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Afslut tegning." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Træk ud" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Opret områder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Træk vej ud" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Slip museknappen for at vælge objekterne inden i firkanten." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Tegn en firkant af passende størrelse og slip så museknappen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Slip museknappen for at stoppe rotationen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Tegn et vejsegment for at danne et rektangel." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Markering" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Vælg, flyt og rotér objekter" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Tilføj og flyt et virtuelt nyt punkt til vej" +msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Flyt elementer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Flyt dem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Fortryd flytning" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Slip museknappen for at stoppe flytningen. Ctrl for at koble sammen med " +"nærmeste punkt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Flyt objekter ved at trække i den; Shift for at tilføje til det valgte (Ctrl " +"for at skifte); Shift-Ctrl for at rotere det valgte; eller skift mellem det " +"valgte" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Forstør" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoom og flyt kort" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Søg..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Søg efter objekter." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Indtast en søgetekst." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "erstat valgte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "føj til valgte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "fjern fra valgte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "versalfølsom" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regulært udtryk" + +#: ../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' og 'Street' i enhver nøgle eller navn." + +#: ../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' i enhver nøgle eller navn." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +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: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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "-name:Bak - intet 'Bak' i navnet." + +#: ../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: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:103 +msgid "id:... - object with given ID" +msgstr "id:... - objekt med det givne 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 +msgid "modified - all changed objects" +msgstr "modified - alle ændrede objekter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - alle valgte objekter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - alle ufuldstændige objekter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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 "" +"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 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Søg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Start søgning" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Intet resultat for \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Fandt {0} resultater" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "Versalfølsom" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "Ikke-versalfølsom" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "Regulært udtryk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Det regulære udtryk \"{0}\" havde en fejl ved tegn {1}; den komplette fejl " +"er:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Mangler argumenter for \"eller\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Mangler argument fro \"ikke\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Forventede slutparentes." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Hent valgte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontakt {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Henter..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Fortolkningsfejl i URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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 "Fjern \"{0}\" for {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekter" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Fjern \"{0}\" for {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Sæt {0}={1} for {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Løse konflikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Intet resultat for \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Markeringen \"{0}\" bruges af relationen \"{1}\".\n" +"Slet fra relation?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Opdel vejstykke" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Du er i gang med at slette punkter uden for området.du har downloadet." +"
Dette kan skabe problemer, fordi andre objekter (som du ikke kan se) " +"måske bruger dem.
Vil du virkelig slette?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Slet fra relation" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Flyt" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "node" +msgstr[1] "noder" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Fjerner 1 primitiv" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Løs {0} tag-konflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Løs versionskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Løs konflikter i punktlisten for vejen {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Udfør?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Når denne vej bliver vendt om, vil følgende af vejens og punkternes " +"egenskaber foreslås ændret for at opretholde data-ensartethed." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relation" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Gammel rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Ny rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Gammel nøgle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Gammel værdi" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Ny nøgle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Ny værdi" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Udfør valgte ændringer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Undlad at udføre ændringer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Egenskaber for " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatisk tag-rettelse" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "" +"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Indstillinger er gemt på {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Kunne ikke hente indstillinger fra serveren." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2569,5 +2863,5 @@ msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2576,27 +2870,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "ufuldstændig" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Fejl: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "punkter" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2604,13 +2898,13 @@ msgstr[1] "veje" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "veje" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2618,22 +2912,22 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "rettesæt" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "rettesæt" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2647,23 +2941,23 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "landevej" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vandvej" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "brug af jord" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2718,5 +3012,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "En vej af typen Område er ikke lukket." @@ -2854,9 +3148,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2873,5 +3162,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "baggrund" @@ -2882,8 +3171,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2894,5 +3183,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert-zone (Frankrig)" @@ -2915,22 +3204,131 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Kunne ikke læse bogmærker." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Kunne ikke gemme bogmærke." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Vis ikke igen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "ukendt" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Uventet handling" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +msgid "Unknown host" +msgstr "Ukendt vært" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Dagens besked er ikke tilgængelig" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- nuværende version er {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Henter \"Dagens besked\"" @@ -3012,63 +3410,57 @@ msgstr "Kodeord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "brug" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "valgmuligheder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Hent det omsluttende område" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hent lokaliteten fra URL'en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Åbn fil (som rå GPS, hvis .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Hent det omsluttende område som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Start op i maksimeret tilstand" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Nulstil indstillingerne til standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Vælg sprog." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3076,51 +3468,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du angive osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktiverer opdaterede udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Henter indledende udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Sætter standardværdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Henter udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Forudindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3128,21 +3520,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Skift trådnet-visning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Skift fra og til Fuldskærm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Lyd" @@ -3186,53 +3578,68 @@ msgstr "skalér" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Den geografiske længdegrad ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Navnet på objektet ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Den geografiske breddegrad ved musemarkøren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Vinklen mellem det forrige og det nuværende vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "(Kompas)retningen af det tegnede linjestykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Længden af det nytegnede vejstykke." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "lag er ikke i listen" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Kontakter OSM-serveren..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Fejl ved fortolkning" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3255,4 +3662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initialiserer" @@ -3284,20 +3692,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3305,47 +3713,47 @@ msgstr "Punkter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Punkter (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Punkter (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Medlemmer (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3353,25 +3761,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Egenskaber (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3408,5 +3816,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Min version" @@ -3417,5 +3825,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3429,5 +3837,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Deres version" @@ -3502,7 +3910,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3576,14 +3983,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3612,10 +4019,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "uventet kolonne-indeks. Modtog {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3624,19 +4031,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Ja, gendan også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nej, fortryd handlingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3647,9 +4054,9 @@ "slettet på serveren.

Ønsker du også at gendanne disse punkter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Gendan yderligere punkter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3659,13 +4066,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Gendan afhængige primitiver?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3673,90 +4080,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "ikke slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Behold mine koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Behold deres koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3766,5 +4173,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3789,12 +4196,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3839,10 +4245,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3851,10 +4257,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3863,5 +4269,5 @@ msgstr "Værdi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3921,9 +4327,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3931,5 +4337,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3961,42 +4367,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Fortsæt alligevel" + +#: ../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 "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Løs versionskonflikter for {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4014,96 +4437,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Slet det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Der er ugemte ændringer. Skal laget alligevel slettes?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Slet lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Vil du virkelig slette hele laget?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Oplysninger" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Fjern" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Slet {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Vis/skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Skift synligheden for det valgte lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Vis/skjul tekst/ikoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Skift synligheden for markør-tekst og -ikoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Lag" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Slet det valgte lag." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Flet laget nedenunder sammen med det valgte lag." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Flyt det valgte lag en række ned." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Flet laget nedenunder sammen med det valgte lag." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Lag: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Mere information om denne feature" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4112,22 +4569,28 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "En tom værdi vil slette nøglen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Ret værdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4136,84 +4599,89 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Vælg venligst en nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Vælg venligst en værdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Vælg de objekter, du vil rette egenskaber for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Egenskaber/medlemsskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Egenskaber for valgte objekter." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Skift relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Slet virkelig det valgte fra relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Tilføj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Rediger egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Fjern egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøgle i alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaber: {0} / Medlemskaber: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Egenskaber / Medlemskaber" @@ -4222,63 +4690,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Åbn en liste over alle relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Slet de nvalgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Opret en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relationer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Slet de nvalgte relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Aktuelt valg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Åbn et vindue med en liste til udvælgelse." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zoom til valgt(e) element(er)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Genopfrisk listen til udvælgelse." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoom til det valgte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4287,5 +4757,5 @@ msgstr[1] "{0} veje" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4294,5 +4764,5 @@ msgstr[1] "{0} relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4303,148 +4773,421 @@ msgstr "Frigør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Klik for at minimere/maksimere panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Forfattere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Åbn en liste af brugere, der arbejder på de valgte objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Forfatter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Forfattere: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Hent område" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Slet de nvalgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Hent synlige tern" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Konflikt i data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Henter udvidelsen {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Fjernede element fra relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Kunne ikke opdatere de valgte primitiver." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Flyt det nuværende valgte medlem op" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Flyt det nuværende valgte medlem ned" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Fjern alle valgte objekter fra relation" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Slet de nvalgte relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Ikke forbundet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konflikt i data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Gem nuværende data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Hent alle ufuldstændige veje og punkter der er forbundet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Hent medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Bekræft Fjernbetjenings-handling" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zoom ud" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Flyt det nuværende valgte medlem ned" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Anvend ændringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Grundlæggende" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Optaget af" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Flyt op" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Flyt det nuværende valgte medlem op" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Tilføj valgte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Tilføj alle valgte objekter som medlemmer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Fjern valgt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Fjern alle valgte objekter fra relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Flyt ned" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Flyt det nuværende valgte medlem ned" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Hent medlemmer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relations-editor: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Der var {0} konflikter under import." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Hent valgte" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4454,5 +5197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4462,25 +5205,22 @@ msgstr[1] "Fjern gamle nøgler fra op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bogmærker" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Indtast venligst først de ønskede koordinater." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Indtast et navn for stedet." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Skift lokalitet" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Vælg først et bogmærke" @@ -4515,21 +5255,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Datakilder og typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Hent som nyt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Hent område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Området er for stort; vil sandsynligvis blive afvist af serveren" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4538,13 +5278,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Indtast venligst en søgestreng" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Kan ikke læse sted søgnings resultat fra serveren" @@ -4552,5 +5292,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Indtast et stednavn at søge efter:" @@ -4558,5 +5298,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4564,6 +5304,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "navn" @@ -4602,6 +5342,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4624,15 +5364,15 @@ msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "nær" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4641,5 +5381,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Flytbart kort" @@ -4671,5 +5411,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5411,5 +6157,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5576,59 +6322,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Billeder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Indlæs GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Intet tidspunkt for punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Ingen billeder med læsbare tidsstempler fundet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Indlæser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotaggede billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS-start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS-slut: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "nuværende forskel: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "tidszone-forskel: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5636,138 +6382,128 @@ msgstr[1] "billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} inden for sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synkronisér ur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-billeder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datoen i filen \"{0}\" kunne ikke forstås." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Billede" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhedens tidszone (forskel fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhed" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke forstås." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Tilpas linjetegning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Brug globale indstillinger." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Tegn linjer mellem punkter for dette lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkter for dette lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Vælg linjetegnings-indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Tilpas farve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Vælg en farve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Markører fra navngivne punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Navngivne punkter fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importér lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave-lydfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importér billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5776,5 +6512,5 @@ msgstr[1] "{0} spor, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5783,5 +6519,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5790,30 +6526,30 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Tidshorisont: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Længde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Konvertér til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5823,43 +6559,43 @@ "
Hvis du vil uploade traces, så kig her:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Konverteret fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Hent fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Hent alt inden for:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5870,10 +6606,10 @@ "du
at fortsætte?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5881,5 +6617,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5887,47 +6623,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "uden for det hentede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5952,5 +6688,5 @@ msgstr[1] "spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5958,5 +6694,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5965,5 +6701,5 @@ msgstr[1] "et spor med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5972,5 +6708,5 @@ msgstr[1] "{0} består af {1} spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5989,5 +6725,5 @@ msgstr[1] "markører" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5996,9 +6732,9 @@ msgstr[1] "{0} består af {1} markører" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synkronisér lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6007,20 +6743,20 @@ "angivelsen." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Lyd synkroniseret på punkt {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Kan ikke synkronisere i det afspillede lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Sæt audio-markør ved afspilnings-starten" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6028,10 +6764,17 @@ msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Vis/skjul tekst/ikoner" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Skift synligheden for markør-tekst og -ikoner" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6039,5 +6782,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6045,29 +6788,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Kan ikke sætte ny audio-markør" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "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:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL var: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Fejl ved visning af URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Udvidede indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Ret indstillingerne direkte. Vær varsom!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6075,14 +6818,14 @@ msgstr "Søg: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Nuværende værdi er standard." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Standardværdien er \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6090,13 +6833,13 @@ "endnu)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Vælg venligst rækken, der skal rettes." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6104,14 +6847,14 @@ msgstr "Ny værdi for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Vælg venligst rækken, der skal slettes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Indtast et nyt nøgle/værdi-sæt" @@ -6234,40 +6977,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farve" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Vælg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Vælg en farve for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Sæt til standardværdi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Sæt alle til standardværdi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Farver brugt af forskellige objekter i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Farver" @@ -6604,46 +7347,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Indstil tilgængelige udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Hent liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Opdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Indstil sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Ret JOSM-udvidelesers beskrvelses-URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Indstil udvidelses-sites" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Indstillinger for visning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6653,29 +7405,29 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Indstillinger for forbindelse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Indstillinger for forbindelse til OSM-serveren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Indstillinger for kort" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Indstilinger for projicering af kort og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Lydindstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Indstillinger for lydafspiller og lydmarkører" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft." @@ -6778,59 +7530,61 @@ msgstr "Genvej" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Vælg venligst rækken, som skal kopieres." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Slet den valgte kilde fra listen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7004,33 +7758,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Mere information om denne feature" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Valgfri attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Brug forudindstilling \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7041,15 +7795,15 @@ msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementer af typen {0} er understøttet." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7059,18 +7813,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Ret egenskaber" @@ -7081,33 +7835,36 @@ msgstr "Forudindstillet gruppe \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Kontakter OSM-serveren..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Henter punkter {0} til {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Downloader OSM-data..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, måske på grund af manglende tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Forbereder data..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kunne ikke læse \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7115,21 +7872,21 @@ msgstr "GPX-filer" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markører fra {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7145,10 +7902,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7156,48 +7932,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183-filer" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Koordinater importeret: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Defekte sætninger: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Fejl ved kontrolsum: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Ukendte sætninger: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Ingen kooordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA-import succesfuld" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Fejl ved NMEAimport!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7206,15 +7981,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7222,23 +7997,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Åbner rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Uploader..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Tjekker mappen {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7282,9 +8070,4 @@ msgstr "Login" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Afbryder..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7334,66 +8117,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Fejl ved fortolkning" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM-serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Ukendt version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Versionsnummer mangler fra OSM-data." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Ukendt version: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Fandt -element i en ikke-vej" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " har nul ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Fandt -element i en ikke-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Ufuldstændig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Ugyldigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7401,47 +8188,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Mangler obligatorisk attribut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Forbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Defekt id for punkt" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Henter historikken..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Forbinder til server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7449,5 +8255,18 @@ "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7456,16 +8275,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} tilbage. Uploader {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Opdater udvidelser" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Hent udvidelser" @@ -7482,5 +8296,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7489,23 +8303,23 @@ msgstr[1] "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Henter udvidelsen {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM-version {0} er krævet for udvidelsen {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Hent udvidelse" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7516,34 +8330,32 @@ msgstr "En fejl opstod i udvidelsen {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Advarsel - brug af {0}-udvidelse blev anmodet. Udvidelsen er ikke længere " "påkrævet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Udvidelsen blev ikke fundet: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Seneste udvidelsesopdatering mere end {0} dage siden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7553,21 +8365,21 @@ "indstillingen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Deaktivér udvidelse." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Behold udvidelse" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7577,5 +8389,5 @@ "til at overskrive de eksisterende udvidelser." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7583,10 +8395,10 @@ msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Ifølge udvidelsen medfølgende information, så er {0} forfatteren." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7595,9 +8407,9 @@ "fejlrapport." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Skal udvidelsen deaktiveres?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7607,27 +8419,23 @@ "udvidelsen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM " -"fra, om problemet." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Oplysninger" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Ingen udvidelsesinformationer blev fundet." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Ingen beskrivelse er tilgængelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Flere detaljer" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7636,13 +8444,18 @@ msgstr[1] "Hent udvidelsesinformationer fra {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Ingen udvidelsesinformationer blev fundet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Alle installerede udvidelser er opdaterede." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7655,9 +8468,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Hent manglende udvidelser" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7670,57 +8483,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "ukendt" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Udvidelse som følger med JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Fejl ved indlæsning af fil med udvidelsesinformationer: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Dette er efter afslutningen på optagelsen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Fejl ved lydafspilning" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Foretag intet" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Rapportér fejl" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7734,19 +8525,19 @@ "udgave af JOSM, kan du hjælpe ved at sende en fejlrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Uventet handling" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Send venligst en fejlrapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7756,17 +8547,34 @@ "indsender en fejlrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Husk at nævne følgende informationer:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(teksten er allerede kopieret til til din udklipsholder.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Vis ikke igen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7779,5 +8587,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7787,5 +8595,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7796,13 +8604,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: Du kan redigere genveje i indstillingerne.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Opret et vejgitter" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7810,21 +8633,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Vælg to veje med et fælles punkt" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Vælg to veje med kun ét fælles punkt" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Opret et gitter af veje" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Send sporing" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7832,74 +8655,75 @@ msgstr "Send sporinger" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Offentlig" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Beskrivelse" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Indtast en beskrivelse af din sporing." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Indtast nogle nøgleord om din sporing" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Valgt spor: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Forbinder..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Opdatering afbrudt" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Fejl under upload" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-upload lykkedes" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Upload fejlede. Serveren angav følgende besked: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Sender GPX-spor: {0}% ({1} af {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Ingen beskrivelse er angivet. Tilføj venligst en beskrivelse." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Intet GPX-lag er valgt. Kan ikke sende sporingen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Intet brugernavn er angivet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Intet kodeord er angivet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Sender GPX-spor" @@ -7969,33 +8793,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Indlæs billeder..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Tjekker mappen {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fandt en null-fil i mappen {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fejl ved hentning af filer fra mappen {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Sammenhold med GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8015,15 +8840,15 @@ msgstr "GPX-filer (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Filen {0} er hentet, dog under navnet \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Fejl ved indlæsning {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8035,34 +8860,34 @@ "vælg en tidszone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/åååå tt:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Jeg er i tidszonen: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Ingen dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Åbn et andet foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkronisér tiden fra et billede på GPS-modtageren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8072,70 +8897,70 @@ "Brug venligst det angivne format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX-spor: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Åben endnu en GPX-sporing" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Tidszone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Forskydning:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Jeg kan tage et billede af min GPS-modtager.
Hjælper det?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Opdater position for: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Alle billeder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Billeder uden EXIF-position" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Endnu ikke taggede billeder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Tilpas billeder med GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Sammenhold" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Automatisk gæt" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Du bør vælge et GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Intet valgt GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8146,9 +8971,9 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Ugyldig tidszone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8159,65 +8984,65 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Ugyldig forskydning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX-spor hentet" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Det valgte billede rummer ingen tidsangivelse" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Billederne rummer ingen tidsangivelser" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX-sporet har ingen tidsangivelser." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Tidszone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minutter: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Tidsforskel på {0} dage)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Forskydning mellem spor og billeder: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8225,13 +9050,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Justér tidszone og forskydning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Standardværdier" @@ -8253,5 +9078,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" @@ -8274,6 +9099,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8444,22 +9269,22 @@ msgstr "Tilføj \"source=...\" til elementer?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Henter {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Kontakter WMS-server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Opret bygninger" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8467,18 +9292,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8591,6 +9416,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Tomt lag" @@ -8619,5 +9444,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8626,14 +9451,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8721,4 +9546,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Intet data indlæst." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8729,9 +9559,9 @@ msgstr "Opret kopi af vej" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8852,30 +9682,30 @@ msgstr "slet data efter import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importerer data fra enhed" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importerer data fra DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Fejl ved sletning af data." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "importerede data fra {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Intet data fundet på enheden." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Forbindelsen mislykkedes." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8884,14 +9714,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat-import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importer" @@ -8982,40 +9812,40 @@ msgstr "Åbn billeder med ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Retningsindex '{0}' blev ikke fundet" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Søger efter kystlinje..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} punkter indtil videre..." +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "tjekker cache..." @@ -9024,26 +9854,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9128,7 +9950,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "vand" @@ -9274,9 +10096,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Henter billedfil" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kunne ikke hente billede" @@ -9518,18 +10340,18 @@ msgstr "Ukendt status for fejlrapport" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Åbn synlig..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Åbn kun filer, som er synlige i det nuværende synsfelt." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Intet synsfelt åbent - kan ikke afgøre omridset!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9556,33 +10378,33 @@ msgstr "Firefox-programfil" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "hent data fra API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "skift synsfeltet" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "bekræft alle Fjernbetjenings-handlinger manuelt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Fjernbetjening" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Indstillinger for Fjernbetjeningsudvidelsen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9591,28 +10413,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Tilladte handlinger" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Anmod om detaljer: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Vil du tillade dette?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Bekræft Fjernbetjenings-handling" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9876,4 +10698,25 @@ msgstr "Fremhæv" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10120,33 +10963,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Indtast længde/bredde for at springe til position." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Du kan også indsætte en URL fra www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (i meter)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Spring hertil" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Hop til position" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Kunne ikke aflæse længde, bredde eller zoom. Tjek venligst." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Kunne ikke aflæse længde/bredde" @@ -10178,6 +11021,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Valideringsfejl" @@ -10187,10 +11030,10 @@ msgstr "Ingen valideringsfejl" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Gitter" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10280,23 +11123,15 @@ msgstr "Foretager datavalidering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Data med fejl. Send alligevel?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Åbn valideringsvindue" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoom til problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Validér" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Validér enten den nuværende selektion eller det fulde datasæt" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10369,10 +11204,10 @@ msgstr "Krydsende veje" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Dublet-punkter" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" @@ -10380,13 +11215,13 @@ "sted." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Dublet-vejpunkter." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Tjekker for veje med identiske efterfølgende punkter." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Dublet-vejpunkter" @@ -10464,23 +11299,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:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Egenskabstjekker:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ugyldig tagtjekker-linje - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ugyldig stavefejlskontrol-linje: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10491,7 +11326,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Ugyldig kombination af tag/værdi" @@ -10499,78 +11334,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Farvelægger problem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøgle \"{0}\" er ugyldig" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Tags med tomme værdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Ulovlig egenskabsnøgle" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Ulovligt blanktegn i egenskabsnøgle" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Egenskabsværdi begynder eller slutter med blanktegn" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Egenskabsværdi indeholder HTML-kodet tegn" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Nøglen \"{0}\" er ikke kendt i forudindstillingerne" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Forudindstillingerne rummer ikke egenskabs-nøglen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Værdien er ikke kendt i forudindstillingerne" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Tjek egenskabsnøgler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Bekræft egenskabsnøglernes gyldighed op imod en ordliste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Brug kompleks egenskabs-tjekker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "TagChecker-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10578,82 +11415,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Tilføj en ny kilde til listen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Ret den valgte kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Tjek egenskabsværdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Tjek for FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Brug standard-datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Brug standard-datafilen (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Brug standard-fil for stavekontrol." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Brug standard-filen for stavekontrol (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Ret egenskaber" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Kunne ikke finde element-typen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Kunne ikke finde advarsels-niveau" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ugyldigt udtryk ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10798,7 +11635,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "bygning" @@ -10812,5 +11649,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "område" @@ -10845,10 +11682,10 @@ msgstr "Forbundet vejs slutpunkt tæt på anden vej" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Utaggede og uforbundne punkter" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "Denne test tjekker for utaggede punkter, som ikke er del af nogen vej." @@ -10902,8 +11739,32 @@ msgstr "Modsatrettet land: Der er ikke land på venstre side" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10914,10 +11775,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10966,14 +11827,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Korrigeret billede..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10984,26 +11845,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Selvvalgt WMS-link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Besøg hjemmeside" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS-URL eller billede-id:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11011,5 +11872,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Ingen gyldig WMS-URL eller id" @@ -11019,5 +11880,5 @@ msgstr "Tilpas positionen for det valgte WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11026,19 +11887,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatisk download" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lag ({0}), henter automatisk til zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lag ({0}), henter til zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11047,88 +11908,88 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Hent synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Hent WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Fil format fejl" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Åbn et tomt WMS-lag for at hente data fra en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Indstillinger for WMS-udvidelse" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Navn på menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Navn på menu (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS-URL (standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Kopier standardværdi" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11241,11 +12102,16 @@ msgstr "Hent GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Tilføj et baggrundslag, der viser et kort-gitter" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11255,10 +12121,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Hjælper med at vektorisere billeder fra WMS." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11268,5 +12134,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11276,5 +12142,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11284,15 +12150,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer sager fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11301,5 +12167,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11308,5 +12174,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11315,15 +12181,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Tillad andre applikationer at sende kommandoer til JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11332,10 +12198,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Tilføjer ruteplan-egenskaber" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11344,15 +12210,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Tilføjer en dialogboks for at rette tags i tabelform." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11362,10 +12228,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Laver rækkehuse ud af en enkelt blok." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11374,5 +12240,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11383,5 +12249,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11391,11 +12257,18 @@ "for de mest udbredte. Stavekontrol er indbygget for tag-navne." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Let download langs en lang serie af forbundne veje" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12141,5 +13014,5 @@ #: build/trans_presets.java:282 msgid "Parking Aisle" -msgstr "" +msgstr "Parkeringsvej" #. item @@ -12551,58 +13424,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12616,6 +13437,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorvej" @@ -12641,6 +13462,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "forbindelse" @@ -12666,6 +13487,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "primær" @@ -12691,6 +13512,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "sekundær" @@ -12704,5 +13525,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "tertiær" @@ -12720,5 +13541,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "beboelse" @@ -12752,6 +13573,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12778,6 +13599,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12827,5 +13648,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rundkørsel" @@ -13804,5 +14625,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15533,27 +16354,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18392,7 +19213,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "cykel" @@ -18462,7 +19283,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "fod" @@ -18488,5 +19309,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "undergrundsbane" @@ -18977,13 +19798,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -19025,5 +19846,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "hest" @@ -19243,4 +20064,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "motor" + #. color tertiary #. @@ -19275,6 +20158,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "gade" @@ -19330,7 +20213,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19386,8 +20269,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "bane" @@ -19408,5 +20291,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19420,5 +20303,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19439,5 +20322,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19452,5 +20335,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19465,5 +20348,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "flodbred" @@ -19477,5 +20360,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19489,5 +20372,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19515,5 +20398,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akvædukt" @@ -19681,13 +20564,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "menneskeskabt" @@ -19749,7 +20632,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19772,10 +20655,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19811,7 +20694,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19856,6 +20739,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19869,5 +20752,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -19889,5 +20772,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19901,5 +20784,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19947,7 +20830,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19964,5 +20847,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19977,5 +20860,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19990,5 +20873,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -20003,5 +20886,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20016,5 +20899,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20029,5 +20912,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20132,10 +21015,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20149,5 +21032,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -20161,5 +21044,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "rørledning" @@ -20287,12 +21170,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "rekreation" @@ -20306,5 +21189,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20376,8 +21259,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20479,10 +21362,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20868,22 +21751,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20915,6 +21798,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20975,8 +21858,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "helbred" @@ -21329,26 +22212,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "butik" @@ -21420,8 +22303,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21571,9 +22454,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turisme" @@ -21645,8 +22528,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historisk" @@ -21717,8 +22600,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21732,5 +22615,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "stenbrud" @@ -21744,5 +22627,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21764,5 +22647,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21776,5 +22659,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "skov" @@ -21788,5 +22671,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21809,5 +22692,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21821,5 +22704,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industri" @@ -21833,5 +22716,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21845,5 +22728,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21857,5 +22740,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21912,7 +22795,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "militær" @@ -21926,5 +22809,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "kirkegård" @@ -21937,5 +22820,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21950,5 +22833,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "gletsjer" @@ -21962,5 +22845,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulkan" @@ -22015,8 +22898,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -22030,5 +22913,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "buskads" @@ -22042,5 +22925,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "hede" @@ -22054,5 +22937,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "træ" @@ -22066,5 +22949,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -22078,5 +22961,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "strand" @@ -22154,8 +23037,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22203,7 +23086,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "grænse" @@ -22345,10 +23228,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "sted" @@ -22396,6 +23279,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adresse" @@ -22637,5 +23520,5 @@ #: build/trans_wms.java:6 msgid "Open Aerial Map" -msgstr "Åbn luftkort" +msgstr "Hent luftkort" #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& @@ -22692,100 +23575,44 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Datalag" - -#~ msgid "Uploading data" -#~ msgstr "Sender data" - -#~ msgid "Not implemented yet." -#~ msgstr "Endnu ikke implementeret." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Udred konflikter" - -#~ msgid "There were conflicts during import." -#~ msgstr "Der var konflikter ved import." - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objekt har konflikter:" -#~ msgstr[1] "{0} objekter har konflikter:" - -#~ msgid "my version:" -#~ msgstr "min udgave:" - -#~ msgid "their version:" -#~ msgstr "deres udgave:" - -#~ msgid "resolved version:" -#~ msgstr "udredet udgave:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Login-navn (e-mail) til OSM-kontoen." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-brugernavn (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Ukendt vært" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "anderledes" - -#~ msgid "true" -#~ msgstr "sand" - -#~ msgid "false" -#~ msgstr "falsk" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Løs {0} konflikter i {1} objekter" - -#~ msgid "Change" -#~ msgstr "Skift" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Tryk Genindlæs for at genopfriske listen" - -#~ msgid "Revert" -#~ msgstr "Tilbagefør" - -#~ msgid "Date" -#~ msgstr "Dato" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Kunne ikke opstarte API'et. Prøv igen senere." + +#~ msgid "API initialization failed" +#~ msgstr "Opstart af API'et fejlede" #~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Returnér alle valgte objekter til den version, der er valgt i " -#~ "historiklisten." - -#~ msgid "Rotate" -#~ msgstr "Roter" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (tom værdi fjerner tag)" - -#~ msgid "Error parsing server response." -#~ msgstr "Fejl i fortolkning af server-svar." - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan ikke forbinde til serveren." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et " +#~ "datalag?" + +#~ msgid "No data" +#~ msgstr "Intet data" + +#~ msgid "Update failed" +#~ msgstr "Opdateringen fejlede" + +#~ msgid "Missing primitive" +#~ msgstr "Mangler primitiv" + +#~ msgid "Layers: {0}" +#~ msgstr "Lag: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." #~ msgstr "" -#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider." +#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM " +#~ "fra, om problemet." + +#~ msgid "Validate" +#~ msgstr "Validér" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt" #~ msgid "" @@ -22796,6 +23623,64 @@ #~ "igen om kort tid." -#~ msgid "Commit comment" -#~ msgstr "Indsend kommentar" +#~ msgid "Aborting..." +#~ msgstr "Afbryder..." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontakter OSM-serveren..." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (tom værdi fjerner tag)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Tilføj alle valgte objekter som medlemmer" + +#~ msgid "Add Selected" +#~ msgstr "Tilføj valgte" + +#~ msgid "Error parsing server response." +#~ msgstr "Fejl i fortolkning af server-svar." + +#~ msgid "There were conflicts during import." +#~ msgstr "Der var konflikter ved import." + +#~ msgid "Revert" +#~ msgstr "Tilbagefør" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan ikke forbinde til serveren." + +#~ msgid "Date" +#~ msgstr "Dato" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Not implemented yet." +#~ msgstr "Endnu ikke implementeret." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Udred konflikter" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Login-navn (e-mail) til OSM-kontoen." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-brugernavn (e-mail)" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Udvidelsen findes allerede" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22806,9 +23691,62 @@ #~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." +#~ msgid "their version:" +#~ msgstr "deres udgave:" + +#~ msgid "resolved version:" +#~ msgstr "udredet udgave:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objekt har konflikter:" +#~ msgstr[1] "{0} objekter har konflikter:" + +#~ msgid "my version:" +#~ msgstr "min udgave:" + +#~ msgid "Rotate" +#~ msgstr "Roter" + +#~ msgid "Change" +#~ msgstr "Skift" + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" -#~ msgid "image not loaded" -#~ msgstr "billedet er ikke indlæst" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Løs {0} konflikter i {1} objekter" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "anderledes" + +#~ msgid "false" +#~ msgstr "falsk" + +#~ msgid "true" +#~ msgstr "sand" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "unnamed" +#~ msgstr "unavngivet" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Nogle af punkterne er (næsten) på linjen" + +#~ msgid "Occupied By" +#~ msgstr "Optaget af" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importér TCX-fil som GPS-spor" #~ msgid "" @@ -22819,51 +23757,15 @@ #~ "flyt musen. Vælg: Klik" -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Tilpas positionen for WMS-laget" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" +#~ msgid "Import TCX File..." +#~ msgstr "Importér TCX-fil..." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Tryk Genindlæs for at genopfriske listen" + +#~ msgid "Commit comment" +#~ msgstr "Indsend kommentar" #~ msgid "Server does not support changesets" #~ msgstr "Serveren undersøtter ikke rettesæt" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Udvidelsen findes allerede" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Nogle af punkterne er (næsten) på linjen" - -#~ msgid "Drawbridge" -#~ msgstr "Vindebro" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Importér TCX-fil..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importér TCX-fil som GPS-spor" #~ msgid "" @@ -22875,4 +23777,99 @@ #~ "klar tekst til serveren, integreret i URLen.

Brug ikke et " #~ "værdifuldt kodeord." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk." + +#~ msgid "Data Layer" +#~ msgstr "Datalag" + +#~ msgid "Drawbridge" +#~ msgstr "Vindebro" + +#~ msgid "Portcullis" +#~ msgstr "Faldgitter" + +#~ msgid "image not loaded" +#~ msgstr "billedet er ikke indlæst" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Tilpas positionen for WMS-laget" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikter: {0}" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den " +#~ "nuværende version ved at slette det eksisterende arkiv?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Basic" +#~ msgstr "Grundlæggende" + +#~ msgid "Remove Selected" +#~ msgstr "Fjern valgt" + +#~ msgid "Move Up" +#~ msgstr "Flyt op" + +#~ msgid "Move Down" +#~ msgstr "Flyt ned" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Returnér alle valgte objekter til den version, der er valgt i " +#~ "historiklisten." + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relations-editor: {0}" + +#~ msgid "Delete and Download" +#~ msgstr "Slet og hent" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Denne handling kræver {0} individuelle download-anmodninger. Vil du " +#~ "fortsætte?" + +#~ msgid "viaduct" +#~ msgstr "viadukt" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Ret en vindebro" + +#~ msgid "Edit Portcullis" +#~ msgstr "Ret et faldgitter" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede " +#~ "elementer har en historik." + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Følgende fejl opstod under den samlede download:" #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -22930,11 +23927,25 @@ #~ "billedet." -#~ msgid "Portcullis" -#~ msgstr "Faldgitter" +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Hjælpesiden mangler. Opret den på ." #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk." +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Hjælpesiden mangler. Opret den på . eller i dit eget sprog." + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" #~ msgid "" @@ -22950,66 +23961,4 @@ #~ "en fransk WMS-server.\n" #~ "Upload ikke noget data efter denne besked." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den " -#~ "nuværende version ved at slette det eksisterende arkiv?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikter: {0}" - -#~ msgid "viaduct" -#~ msgstr "viadukt" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download" - -#~ msgid "Delete and Download" -#~ msgstr "Slet og hent" - -#~ msgid "Solve Conflict" -#~ msgstr "Løse konflikt" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede " -#~ "elementer har en historik." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Denne handling kræver {0} individuelle download-anmodninger. Vil du " -#~ "fortsætte?" - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Følgende fejl opstod under den samlede download:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Ret en vindebro" - -#~ msgid "Edit Portcullis" -#~ msgstr "Ret et faldgitter" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Hjælpesiden mangler. Opret den på ." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Hjælpesiden mangler. Opret den på . eller i dit eget sprog." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Hent TCX-filer direkte fra JOSM." #~ msgid "" @@ -23027,4 +23976,25 @@ #~ "Upload ikke noget data efter denne besked." +#~ msgid "Undeleting Way..." +#~ msgstr "Gendanner vej..." + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Tjekker om punktet {0} er væk ..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Gendanner relation..." + +#~ msgid "Keep mine" +#~ msgstr "Behold mine" + +#~ msgid "Checking whether primitive {0} is gone ..." +#~ msgstr "Tjekker om primitiven {0} er væk ..." + +#~ msgid "Delete mine" +#~ msgstr "Slet mine" + +#~ msgid "Selection too big" +#~ msgstr "Der er valgt for meget" + #~ msgid "% of lat:" #~ msgstr "% af bredde:" @@ -23033,22 +24003,4 @@ #~ msgstr "% af længde:" -#~ msgid "Undeleting Way..." -#~ msgstr "Gendanner vej..." - -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Tjekker om punktet {0} er væk ..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Gendanner relation..." - -#~ msgid "Checking whether primitive {0} is gone ..." -#~ msgstr "Tjekker om primitiven {0} er væk ..." - -#~ msgid "Keep mine" -#~ msgstr "Behold mine" - -#~ msgid "Delete mine" -#~ msgstr "Slet mine" - -#~ msgid "Selection too big" -#~ msgstr "Der er valgt for meget" +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Hent TCX-filer direkte fra JOSM." Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 16826) +++ /applications/editors/josm/i18n/po/de.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-13 10:55+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-27 20:35+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,21 +16,28 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Hauptfenster erzeugen" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -39,61 +46,134 @@ "benutzt." -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Ungespeicherte Änderungen" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Speichern und Beenden" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Verwerfen und Beenden" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -102,32 +182,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Abbrechen" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Warnung" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "UNBEKANNT" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Über" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Über dieses Programm" @@ -135,10 +275,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -146,5 +286,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -153,19 +293,19 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Letzte Änderung am {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java-Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Webseite" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Fehler melden" @@ -175,37 +315,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Bitte lesen" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Version" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Mitwirkende" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Lizenz" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Über JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Datei wurde nicht gefunden." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -217,5 +361,5 @@ "API-URL ist: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,12 +367,5 @@ "oder Relation) auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Warnung" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -239,7 +376,35 @@ "angezeigt." +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Bitte wählen Sie die zu löschende Zeile." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Bitte wählen:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Knotenpunkte vereinigen" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Knotenpunkt hinzufügen..." @@ -251,14 +416,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -266,57 +433,57 @@ msgstr "Bearbeiten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Koordinaten des neuen Knotens eingeben." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Verwenden Sie Angaben in Dezimalgrad." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative Werte für die westliche oder südliche Hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Breitengrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Längengrad" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Knotenpunkte im Kreis anordnen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Gewählte Punkte in einem Kreis anordnen." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -332,25 +499,58 @@ msgstr "Werkzeug: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Bitte mindestens vier Knotenpunkte auswählen." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Knotenpunkte in einer Linie anordnen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Gewählte Punkte so verschieben, dass sie in einer Linie liegen." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Bitte mindestens drei Knotenpunkte auswählen." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -361,18 +561,10 @@ "({1})." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Unvereinbarkeit den Fähigkeiten der API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "API-Initialisierung fehlgeschlagen - bitte später versuchen" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "API-Initialisierung fehlgeschlagen" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -383,5 +575,5 @@ "abgeschnitten" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -392,9 +584,9 @@ "die maximal erlaubte Länge ({2})." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -403,37 +595,37 @@ "({2})" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "Daten" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "Ebene" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "Auswahl" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "heruntergeladene Daten" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Auf {0} zoomen" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Ansicht auf {0} zoomen" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -443,46 +635,46 @@ msgstr "Anzeige: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Nichts ausgewählt, auf das gezoomt werden kann." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " "combine them?" msgstr "" -"Die ausgewählten Wege sind Mitglieder unterschiedlicher Relationen. Sollen " -"sie wirklich verbunden werden?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +"Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen sie " +"wirklich verbunden werden?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Trotzdem verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Richtungen ändern?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -492,10 +684,10 @@ "Möchten Sie, dass einige Richtungen gedreht werden?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Drehen und Verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -503,20 +695,20 @@ msgstr "Werte für alle Konflikte festlegen." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "{0} Wege verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Alle Wege sind leer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -535,23 +727,24 @@ msgstr "Gewählte Objekte in die Zwischenablage kopieren." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Bitte etwas zum Kopieren auswählen." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Kreis erstellen" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Einen Kreis aus drei ausgewählten Knoten erstellen." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Diese Knoten sind nicht in einem Kreis angeordnet." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -561,87 +754,122 @@ "exakt 2 oder 3 Knoten ausgewählt werden." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Entfernen" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Ausgewählte Objekte löschen." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Überschreiben" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Knoten verteilen" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Kartendaten vom OSM-Server laden." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Datei: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "Verweise von OSM herunterladen..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +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 +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:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Es traten {0} Konflikte während des Imports auf." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Fehler beim Herunterladen" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Lade Eltern des Primitiven {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplizieren" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Auswahl durch Kopieren und sofortiges Einfügen duplizieren." @@ -661,5 +889,5 @@ msgstr "Programm beenden" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -669,58 +897,74 @@ "unter der GPL stehen, hochladen." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Als GPX exportieren..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Die Daten ins GPX-Format exportieren." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "Parameter ''{0}'' darf nicht null sein" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" +"Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "Beschreibung der GPS-Spur" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Information zum Autor hinzufügen." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Voller Name" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Vordefiniert" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Jahr des Copyrights" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Schlüsselwörter" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Export-Einstellungen" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportieren und Speichern" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -731,25 +975,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Fehler" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Eine vordefinierte Lizenz auswählen" @@ -759,46 +983,49 @@ msgstr "JOSM-Onlinehilfe" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Im Browser öffnen" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Bearbeiten" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Neu laden" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Sie können nur die Hilfeseiten der JOSM-Onlinehilfe bearbeiten." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Fehler beim Laden der Seite {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Hilfeseite fehlt. In englischer Sprache erstellen." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -836,30 +1063,40 @@ msgstr "Einen Knotenpunkt an der nächsten Stelle in den Weg einfügen." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Knotenpunkt und Linie vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Kein Tastenkürzel" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Trotzdem vereinen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -869,9 +1106,9 @@ "wirklich vereint werden?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Trotzdem vereinen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -879,60 +1116,71 @@ "gelöscht werden." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "{0} Knotenpunkte vereinigen" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "Auswahl" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Aktualisiert die ausgewählten Objekt vom Server" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Spiegeln" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Gewählte Knotenpunkte und Wege spiegeln." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Bitte mindestens einen Weg oder Knoten wählen." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "hoch" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Objekte {0} verschieben" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "runter" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "links" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "rechts" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "{0} verschieben" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Verschiebt Objekte {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben." @@ -940,5 +1188,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Neu" @@ -948,26 +1196,17 @@ msgstr "Eine neue Karte erstellen." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "unbenannt" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Öffnen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Datei öffnen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kann \"{0}\" nicht lesen" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -996,36 +1235,37 @@ msgstr "URL herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Form rechtwinklig machen" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Nur zwei Knoten erlaubt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Auswahl darf nur aus Wegen bestehen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Sie nutzen die EPSG:4326-Projektion. Diese kann beim Erzeugen
von " @@ -1033,9 +1273,9 @@ "Projektion zum Ausschalten dieser Warnung.
Wollen Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Nur ein Knoten ausgewählt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Rechtwinklig machen" @@ -1051,11 +1291,11 @@ msgstr "Inhalt der Zwischenablage einfügen." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Merkmale einfügen" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." @@ -1083,16 +1323,21 @@ msgstr "Letzte Änderung wiederherstellen." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Ebene umbennen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Die Datei auch umbenennen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Kann die Datei \"{0}\" nicht umbenennen." @@ -1106,9 +1351,9 @@ msgstr "Die Richtung aller gewählter Wege umdrehen." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Bitte mindestens einen Weg wählen." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Richtung des Weges drehen" @@ -1116,17 +1361,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Speichern" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Aktuelle Daten speichern." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Datei {0} existiert bereits. Überschreiben?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1136,25 +1383,25 @@ "no layer.\"" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Leeres Dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Das Dokument enthält keine Daten." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Trotzdem speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikte" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1164,54 +1411,76 @@ "Sollen alle Konflikte abgewiesen werden?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Konflikte abweisen und speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "OSM-Datei speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "GPX-Datei speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Ebene speichern" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Sicherung der Datei konnte nicht erstellt werden." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Dateiendung unbekannt: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Fehler bei der Kommunikation mit dem Server
Details: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Dateiendung unbekannt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Beim Speichern ist ein Fehler aufgetreten." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Speichern unter..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Aktuelle Daten in einer neuen Datei speichern." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Alles auswählen" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1245,16 +1514,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Schließen" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Weg aufspalten" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Weg am gewählten Knotenpunkt aufspalten." @@ -1264,5 +1533,5 @@ msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1270,5 +1539,5 @@ msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1284,9 +1553,9 @@ "Bitte auch den Weg auswählen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Die gewählten Punkte gehören nicht zum selben Weg." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1294,6 +1563,6 @@ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" @@ -1301,5 +1570,5 @@ "trennen zu können." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1309,8 +1578,9 @@ "in der Mitte des Weges.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege " @@ -1318,13 +1588,14 @@ "Sie sollten dies überprüfen und falls nötig korrigieren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" -"Alle neuen Wege wurden zum Mitglied in einer Relation gemacht.\n" -"Bitte prüfen und korrigieren Sie dies ggf." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Alle neuen Wege wurden Element in einer Relation gemacht.\n" +"Bitte prüfen und korrigieren Sie dies falls notwendig." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1345,42 +1616,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Dieser Knoten ist mit nichts verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Bitte wählen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Ein Knoten mit Merkmalen, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1388,5 +1659,5 @@ "oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1395,5 +1666,5 @@ "verwendet werden, oder" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1402,5 +1673,5 @@ "werden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1414,9 +1685,9 @@ "und alle Knoten werden ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Knotenpunkte getrennt" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1424,5 +1695,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1438,142 +1709,92 @@ msgstr "Letzte Aktion zurücknehmen." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Nichts auswählen" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Keine Objekte auswählen." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Nichts auswählen (Fokus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Nichts auswählen (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Daten aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Keine Daten zum Aktualisieren gefunden. Haben Sie bereits eine Datenebene " -"heruntergeladen oder geöffnet?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Keine Daten" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Fehler beim Hochladen der gewählten Objekte" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Aktualisierung fehlgeschlagen" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Keine GPX-Datenebene gefunden." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Konnte Objekt mit ID {0} im aktuellen Datensatz nicht finden" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Objekt fehlt" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Auswahl aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Aktualisiert die ausgewählten Objekt vom Server" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Auswahl leer" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Zum OSM-Server hochladen..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Alle Änderungen zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Neue Objekte:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Geänderte Objekte:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Zu löschende Objekte:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Diese Änderungen hochladen?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Änderungen hochladen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Keine Änderungen zum Hochladen vorhanden." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Hochladen" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Objekt aktualisieren" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Nur {0} {1} synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Ganzen Datensatz synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1596,17 +1817,17 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Konflikt festgestellt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "Unerwarteter Rückgabewert: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1622,40 +1843,10 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Hochladen auf den Server ist fehlgeschlagen, da der " -"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung ist:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Vorbedingung nicht erfüllt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Hochladen fehlgeschlagen, da das zu löschende " -"Objekt
auf dem Server schon gelöscht ist.

Die Fehlermeldung ist:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Objekt bereits gelöscht" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" @@ -1663,22 +1854,55 @@ "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "Hochladen fehlgeschlagen.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Hochladen zu OSM-API fehlgeschlagen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Objekt aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Alle Änderungen zum OSM-Server hochladen." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n" -"Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Neue Objekte:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Geänderte Objekte:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1766,42 +1990,55 @@ msgstr "Langsamer abspielen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Hole GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Heruntergeladene GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "GPS-Rohdaten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Daten herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, fuzzy, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Keine Daten importiert." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "{0} von {1} herunterladen (noch {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Daten aktualisieren" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Die folgenden Fehler sind während des Herunterladens aufgetreten:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Fehler beim Herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1819,21 +2056,21 @@ "ignorieren
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Gelöschte oder verschobene Objekte" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Löschmodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Knotenpunkte oder Wege löschen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1841,5 +2078,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1849,778 +2086,23 @@ "Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Zeichnen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Knotenpunkt setzen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Modus: Zeichnen (Fokus)" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "Ausgewählt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Knotenpunkt hinzufügen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Knotenpunkt in einen Weg einfügen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Existierenden Weg mit Knotenpunkt verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Einen neuen Knoten erstellen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Knoten unter Mauszeiger wählen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Neuen Knoten in Weg einfügen." -msgstr[1] "Neuen Knoten in {0} Wege einfügen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Neuen Weg an letztem Knoten beginnen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Weg am letzten Knoten fortsetzen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Zeichnen beenden." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Ausziehen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Gebiete erstellen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Weg ausziehen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Maustaste loslassen, um das Drehen zu stoppen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Abspielposition in der Nähe einer GPS-Spur ablegen, um Audio abzuspielen. " -"Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Auswahl" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Objekte auswählen, verschieben, und drehen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Virtuellen Knoten zu Weg hinzufügen und bewegen" -msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Elemente verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" -"Sie haben mehr als {0} Elemente verschoben. Das Verschieben mehrerer " -"Elemente geschieht häufig unbeabsichtigt.\n" -"Wollen Sie sie wirklich verschieben?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Verschieben rückgängig machen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten " -"Punkt vereinigen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Ziehen: Objekte verschieben. Umschalt: Auswahl hinzufügen. Strg: Auswahl " -"umschalten. Umschalt-Strg: drehen oder Auswahl ändern." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoomen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoomen und Karte verschieben" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Zoomen mit ziehen oder Ctrl+. oder Ctrl+,; Verschieben mit Ctrl+hoch, links, " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Suchen..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Nach Objekten suchen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Keine Daten geladen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Bitte einen Suchbegriff eingeben." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "Auswahl ersetzen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "zur Auswahl hinzufügen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "aus der Auswahl entfernen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "Groß-/Kleinschreibung beachten" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "Regulärer Ausdruck" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Berliner Straße - 'Berliner' und 'Straße' in einem Schlüssel oder " -"Namen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -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:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Ber - 'Ber' irgendwo im Namen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - Schlüssel 'type' mit beliebigem Wert. Auch *=wert, " -"type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Ber - kein 'Ber' im Namen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -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:91 -msgid "Special targets:" -msgstr "Spezialsuchen:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - Objekt mit gegebener ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - Objekte mit gegebener Knotenanzahl" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - Alle geänderten Objekte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - Alle ausgewählten Objekte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - Alle unvollständigen Objekte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - Alle Objekte ohne Merkmale" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child ausdr - Alle untergeordneten Objekte des passenden " -"Ausdrucks" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent ausdr - Alle übergeordneten Objekte des passenden " -"Ausdrucks" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -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:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Suche" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Suche starten" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Nichts gefunden für Suche ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} Treffer gefunden" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Der reguläre Ausdruck \"{0}\" hat einenFehler an Position {1}.\n" -"Fehlermeldung:\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Unbekannter OSM-Typ: {0}. Erlaubte Werte sind \"node\", \"way\" oder " -"\"relation\"." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Unerwartete Daten: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Fehlendes Argument für 'OR'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Fehlendes Argument für 'NICHT'." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Schließende Klammer erwartet." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Falsche Anzahl an Parametern für Knoten-Operator." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Ungültiger Wert für Knoten-Operator: {0}. Operator erwartet Knotenanzahl " -"oder -bereich, z.B. \"nodes:1-20\"." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Verbinden zu {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Daten werden geladen..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Konnte nicht von der URL \"{0}\" lesen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "URL \"{0}\" kann nicht interpretiert werden." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -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:57 -#, java-format -msgid "Add {0} {1}" -msgstr "{0} {1} hinzufügen" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "{0} {1} ändern" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "\"{0}\" entfernen für {1} \"{2}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "{0}={1} setzen für {2} \"{3}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "Objekt" -msgstr[1] "Objekte" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "\"{0}\" entfernen für {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "{0}={1} setzen für {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "Ändere Role des Relationselements {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" -"Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " -"nicht mehr existiert." - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Koordinatenkonflikte für {0} auflösen" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "Kann unentschiedenen Konflikt nicht auflösen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} löschen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} löschen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Konflikt mit Relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n" -"Aus Relation entfernen?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Aus der Relation entfernen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n" -"Aus Relation entfernen?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Wegabschnitt aufspalten" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen." -"
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) " -"diese verwenden.
Wollen Sie die Knoten wirklich löschen?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Konflikte im Löschstatus für {0} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Verschieben" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "Knotenpunkt" -msgstr[1] "Knotenpunkte" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "1 Objekt entfernen" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "Entferne Referenz aus Weg {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Warnung: Weg {0} wird gelöscht da die Anzahl der Knotenpunkte {1} ist. Es " -"werden aber min. 2 Knotenpunkte benötigt." - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "Entferne Referenz aus Relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "Relationselement {0} {1} entfernen" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Drehen {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Abfolge" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Versionskonflikt für {0} {1} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Konflikte in Knotenliste des Weges {0} auflösen" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "Hauptdatensatz enthält Knoten {0} nicht" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Anwenden?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende " -"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relation" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Alter Rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Neue Rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Alter Schlüssel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Alter Wert" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Neuer Schlüssel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Neuer Wert" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Ausgewählte Änderungen anwenden" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Änderungen nicht anbringen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Eigenschaften von " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Rollen in Relationen beziehen sich auf" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatische Merkmalskorrektur" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Einstellungen auf {0} gespeichert" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Kann keine Einstellungen vom Server laden." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "Konflikt mit Element \"{0}\" besteht bereits" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2632,8 +2114,816 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "Parameter \"{0}\" darf nicht NULL sein" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Zeichnen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Knotenpunkt setzen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "Ausgewählt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Knotenpunkt hinzufügen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Knotenpunkt in einen Weg einfügen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Existierenden Weg mit Knotenpunkt verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Einen neuen Knoten erstellen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Knoten unter Mauszeiger wählen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Neuen Knoten in Weg einfügen." +msgstr[1] "Neuen Knoten in {0} Wege einfügen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Neuen Weg an letztem Knoten beginnen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Weg am letzten Knoten fortsetzen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Zeichnen beenden." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Ausziehen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Gebiete erstellen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Weg ausziehen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Maustaste loslassen, um das Drehen zu stoppen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Abspielposition in der Nähe einer GPS-Spur ablegen, um Audio abzuspielen. " +"Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Auswahl" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Objekte auswählen, verschieben, und drehen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Virtuellen Knoten zu Weg hinzufügen und bewegen" +msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Elemente verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Sie haben mehr als {0} Elemente verschoben. Das Verschieben mehrerer " +"Elemente geschieht häufig unbeabsichtigt.\n" +"Wollen Sie sie wirklich verschieben?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Verschieben rückgängig machen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten " +"Punkt vereinigen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Ziehen: Objekte verschieben. Umschalt: Auswahl hinzufügen. Strg: Auswahl " +"umschalten. Umschalt-Strg: drehen oder Auswahl ändern." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoomen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoomen und Karte verschieben" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Zoomen mit ziehen oder Ctrl+. oder Ctrl+,; Verschieben mit Ctrl+hoch, links, " +"runter, rechts; Zoom verschieben mit rechter Maus" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Suchen..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Nach Objekten suchen." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Bitte einen Suchbegriff eingeben." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "Auswahl ersetzen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "zur Auswahl hinzufügen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "aus der Auswahl entfernen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "Groß-/Kleinschreibung beachten" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "Regulärer Ausdruck" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Berliner Straße - 'Berliner' und '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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - Schlüssel 'type' mit beliebigem Wert. Auch *=wert, " +"type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Spezialsuchen:" + +#: ../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: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 +msgid "modified - all changed objects" +msgstr "modified - Alle geänderten Objekte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - Alle ausgewählten Objekte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - Alle unvollständigen Objekte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - Alle Objekte ohne Merkmale" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child ausdr - Alle untergeordneten Objekte des passenden " +"Ausdrucks" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent ausdr - Alle übergeordneten Objekte des passenden " +"Ausdrucks" + +#: ../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." + +#: ../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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Suche" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Suche starten" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "{0} Treffer gefunden" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Der reguläre Ausdruck \"{0}\" hat einenFehler an Position {1}.\n" +"Fehlermeldung:\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Unbekannter OSM-Typ: {0}. Erlaubte Werte sind \"node\", \"way\" oder " +"\"relation\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Unerwartete Daten: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Fehlendes Argument für 'OR'." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Fehlendes Argument für 'NICHT'." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Schließende Klammer erwartet." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Falsche Anzahl an Parametern für Knoten-Operator." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Ungültiger Wert für Knoten-Operator: {0}. Operator erwartet Knotenanzahl " +"oder -bereich, z.B. \"nodes:1-20\"." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Auswahl laden" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Verbinden zu {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, 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 +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}" +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}''" +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}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "Objekt" +msgstr[1] "Objekte" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "\"{0}\" entfernen für {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "{0}={1} setzen für {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Ändere Role des Relationselements {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Konflikte lösen" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "Konflikt mit Element \"{0}\" besteht bereits" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Nichts gefunden für Suche ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " +"nicht mehr existiert." + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Koordinatenkonflikte für {0} auflösen" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n" +"Aus Relation entfernen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Wegabschnitt aufspalten" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Sie sind dabei Knoten außerhalb des heruntergeladenen Bereichs zu löschen." +"
Das kann zu Problemen führen, wenn andere Objekte (die Sie nicht sehen) " +"diese verwenden.
Wollen Sie die Knoten wirklich löschen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Aus der Relation entfernen" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Konflikte im Löschstatus für {0} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Verschieben" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "Knotenpunkt" +msgstr[1] "Knotenpunkte" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "1 Objekt entfernen" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "Entferne Referenz aus Weg {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Warnung: Weg {0} wird gelöscht da die Anzahl der Knotenpunkte {1} ist. Es " +"werden aber min. 2 Knotenpunkte benötigt." + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "Entferne Referenz aus Relation {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Drehen {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Abfolge" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "{0} Merkmalskonflikte für {1} {2} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Versionskonflikt für {0} {1} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Konflikte in Knotenliste des Weges {0} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "Hauptdatensatz enthält Knoten {0} nicht" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Anwenden?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Für das Umdrehen des Weges werden zum Erhalt der Datenintegrität folgende " +"Eigenschaftsänderungen am Weg und seinen Knoten vorgeschlagen." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relation" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Alter Rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Neue Rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Alter Schlüssel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Alter Wert" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Neuer Schlüssel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Neuer Wert" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Ausgewählte Änderungen anwenden" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Änderungen nicht anbringen" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Eigenschaften von " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Rollen in Relationen beziehen sich auf" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatische Merkmalskorrektur" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Einstellungen auf {0} gespeichert" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Kann keine Einstellungen vom Server laden." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "Konflikt mit Element \"{0}\" besteht bereits" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2661,5 +2951,5 @@ msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2668,27 +2958,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "unvollständig" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Warnung: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "Knotenpunkte" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2696,13 +2986,13 @@ msgstr[1] "Wege" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "Wege" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2710,17 +3000,17 @@ msgstr[1] "Relationen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "Relationen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "Änderungssatz" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "Änderungsätze" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" @@ -2729,5 +3019,5 @@ "Name." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2742,23 +3032,23 @@ msgstr[1] "{0} Elemente" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "Straße" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "Eisenbahn" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "Gewässer" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "Landfläche" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2816,5 +3106,5 @@ msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Flächenförmiger Weg ist nicht geschlossen." @@ -2954,9 +3244,4 @@ "der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [ID: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2973,5 +3258,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "Hintergrund" @@ -2982,8 +3267,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" +msgid "WGS84 Geographic" msgstr "WGS84 Geografisch" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2999,5 +3284,5 @@ "die Daten und starten Sie eine neue Ebene mit der neuen Zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert-Zone (Frankreich)" @@ -3020,22 +3305,140 @@ msgstr "UTM Zone {0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Lesezeichen konnten nicht gelesen werden." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Lesezeichen konnten nicht geschrieben werden." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Nicht noch einmal zeigen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Hochladen auf den Server ist fehlgeschlagen, da der " +"Datensatz
eine Vorbedingung nicht erfüllt.
Die Fehlermeldung ist:
" +"{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Vorbedingung nicht erfüllt" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "unbekannt" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Unerwarteter Fehler" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre " +"Internetverbindung." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +#, fuzzy +msgid "Unknown host" +msgstr "Unbekanntes Aufzeichnungsformat" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Hochladen fehlgeschlagen, da das zu löschende " +"Objekt
auf dem Server schon gelöscht ist.

Die Fehlermeldung ist:" +"
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Objekt bereits gelöscht" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, fuzzy, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" +"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Nachricht des Tages nicht verfügbar" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- aktive Version ist {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Nachricht des Tages herunterladen" @@ -3118,64 +3521,57 @@ msgstr "Passwort" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Für die Sprache {0} konnte keine Übersetzung gefunden werden. Es wird {1} " -"genutzt." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "Optionen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Diese Hilfe anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standard Unix Geometrie Argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Bounding Box herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Bounding Box als GPS-Spuren herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Mit der angegebenen Suche auswählen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Mit maximiertem Fenster starten" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Die Einstellungen auf Standardwerte zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Die Sprache festlegen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "Beispiele" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3186,51 +3582,51 @@ "--selection verwendet wird." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Anstatt --download= ist auch osm:// möglich\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktualisierte Plugins aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Zeitige Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Voreinstellungen setzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3238,21 +3634,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Drahtdarstellung" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Drahtdarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Vollbild" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Vollbilddarstellung umschalten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3296,53 +3692,68 @@ msgstr "Skala" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Die geographische Länge an der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Der Name des Objekts unter der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Die geographische Breite an der Mausposition." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Die Länge des neu zu zeichnenden Wegabschnittes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(kein Objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "Ebene nicht in der Liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "Ebene {0} muss in der Ebenenliste sein" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "OSM-Server kontaktieren..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Fehler beim Einlesen" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3366,4 +3777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initialisieren" @@ -3395,20 +3807,20 @@ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Eigenschaften" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Merkmale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3416,30 +3828,30 @@ msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Elemente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Merkmale({0} Konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} verbleibende Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Knoten(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3448,17 +3860,17 @@ "Knotenliste des Weges." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Knoten(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Verbleibende Konflikte in der Knotenliste des Weges" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Elemente(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3468,25 +3880,25 @@ "Elementenliste der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Elemente(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Verbleibende Konflikte in der Elementenliste der Relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "Keine verbleibenden Eigenschaftskonflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Eigenschaften(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Verbleibende Eigenschaftskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Konfliktlösung" @@ -3523,5 +3935,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Meine Version" @@ -3532,5 +3944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3546,5 +3958,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Deren Version" @@ -3632,7 +4044,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3708,14 +4119,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "Parameter \"{0}\" darf nicht NULL sein." @@ -3748,10 +4159,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "Unerwarteter Spaltenindex ({0})" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3761,19 +4172,19 @@ "Fehler bei der Kommunikation mit dem Server
Details: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Fehler bei der Kommunikation mit dem Server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Ja, auch wiederherstellen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nein, Operation abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3785,9 +4196,9 @@ "wiederhergestellt werden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Zusätzliche Knoten wiederherstellen?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3800,13 +4211,13 @@ "wiederhergestellt werden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Abhängige Objekte wiederherstellen?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3816,90 +4227,90 @@ "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Koordinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(nichts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "nicht gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "Sichtbar (auf Server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" -msgstr "gelöscht (auf dem Server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +msgstr "nicht sichtbar (auf dem Server)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Exakte Kopie der lokalen Version behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Aus dem lokalen Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Behalte meine Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Behalte Server-Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Behalte den Löchstatus der lokalen Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Behalte den Löchstatus der Server-Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Übernehme meinen Löschstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Ja, diese ID zurücksetzten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Nein, abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3912,5 +4323,5 @@ "neue ID zuteilen.
Sind Sie hiermit einverstanden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "ID auf 0 zurücksetzen" @@ -3937,12 +4348,11 @@ msgstr "Aus dem Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Löschstatus ist unterschiedlich." -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3989,10 +4399,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4001,10 +4411,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4013,5 +4423,5 @@ msgstr "Wert" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "Kann unentschiedenes Merkmalselement nicht anwenden" @@ -4071,9 +4481,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4081,5 +4491,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4109,6 +4519,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4117,35 +4527,39 @@ "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Konflikte auflösen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Konfliktauflösung abbrechen und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Lösung anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Unvollständiges anwenden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Trotzdem fortfahren" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Weiter auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"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 "" "Es sind noch nicht alle Konflikte gelöst!
Wähle {0}" +#: ../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 "Konflikte auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Versionskonflikt für {0} {1} auflösen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 @@ -4170,96 +4597,130 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, 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:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "History-Eintrag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "History der markierten Elemente anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Ebenen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Liste aller geladenen Ebenen öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Ausgewählte Ebene löschen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Änderungen sind nicht gespeichert. Ebene trotzdem löschen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Ebene löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Soll wirklich die gesamte Ebene gelöscht werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Information" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "{0} {1} löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Anzeigen/Ausblenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Sichtbarkeit der Ebene umschalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Texte/Symbole anzeigen/verbergen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Ebenen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Liste aller geladenen Ebenen öffnen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "Privat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Ausgewählte Ebene löschen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Gewählte Ebene eine Zeile nach unten verschieben." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Ebenen: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Informationstafel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4268,22 +4729,28 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Ein leerer Wert löscht den Schlüssel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Werte ändern?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4292,84 +4759,89 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Bitte wählen Sie einen Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Bitte wählen Sie einen Wert" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Eigenschaften/Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Eigenschaften der ausgewählten Objekte." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" -msgstr "Mitglied von" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +msgstr "Element von" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Relation ändern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Auswahl wirklich aus Relation {0} entfernen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Eigenschaften bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Eigenschaften entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Den gewählten Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Eigenschaften / Mitgliedschaften" @@ -4378,63 +4850,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Eine Liste aller Relationen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relationen: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Gewählte Relation löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Eine neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relationen: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Gewählte Relation löschen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Aktuelle Auswahl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Ein Fenster mit der aktuellen Auswahl öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Auf ausgewählte Elemente zoomen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Die Auswahlliste aktualisieren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Auf Auswahl zoomen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Auswahl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4443,5 +4917,5 @@ msgstr[1] "{0} Wege" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4450,5 +4924,5 @@ msgstr[1] "{0} Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4459,5 +4933,10 @@ msgstr "Ansicht separat darstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4466,15 +4945,15 @@ "Werkzeugleiste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autoren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" @@ -4482,131 +4961,418 @@ "haben." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autoren: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Relationselemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Bereich laden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Verweisende Relationen herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Sichtbare Kacheln 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:1459 +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 +msgid "Conflicts in data" +msgstr "Konflikte in den Daten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Es ist keine Relation ausgewählt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Plugin {0} herunterladen..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" +"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +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 +msgid "Parent Relations" +msgstr "Relationen der Eltern" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relationen" + +#: ../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:593 +msgid "Role:" +msgstr "Rolle:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Elemente aus Relationen entfernt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" +"Alle ausgewählten Objekte im momentanen Datensatz vor dem ersten Element " +"hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" +"Alle ausgewählten Objekte im momentanen Datensatz nach dem letzten Element " +"hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" +"Alle ausgewählten Primitiven im momentanen Datensatz vor dem ersten " +"ausgewählten Element hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" +"Alle ausgewählten Objekte im momentanen Datensatz nach dem letzten " +"ausgewählten Element hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "Relations-Editor: Ausgewählte entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "Relationselemente sortieren" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "Relations-Editor: Sortieren" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +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:922 +msgid "Relation Editor: Move Up" +msgstr "Relations-Editor: Nach oben verschieben" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +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:941 +msgid "Relation Editor: Move Down" +msgstr "Relations-Editor: Nach unten verschieben" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Alle ausgewählten Objekte aus der Relation entfernen" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "Relations-Editor: Entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Gewählte Relation löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Weiter auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +#, fuzzy +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" +"Die Relation wurde ausserhalb des Editors verändert.
Ihre Änderung " +"kann nicht direkt angewandt werden, daher wurde ein Konflikt erstellt." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konflikte in den Daten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Aktuelle Daten speichern." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Übernehmen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +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:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "Updates abbrechen und den Dialog schliessen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Einen leeren Schlüssel hinzufügen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Die ausgewählten Merkmale löschen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +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:1263 +msgid "Download Members" +msgstr "Elemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "Relations-Editor: Elemente herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +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:1285 +msgid "Apply Role" +msgstr "Rolle anwenden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Ja, Entfernen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Fernsteueraktion bestätigen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" +"Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster " +"öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Herauszoomen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Referenziert auf" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "Verknüpft" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "Verweisende Relationen herunterladen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "Direkte Kinder von Elternrelationen einbeziehen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "Lade Elternrelationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "Die ausgewählte Relation bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Änderungen übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Standard" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Belegt durch" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "verbunden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Nach oben" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Ausgewählte Elemente nach oben schieben" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Ausgewähltes hinzufügen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Alle ausgewählten Objekte als Elemente hinzufügen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Ausgewähltes entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Alle ausgewählten Objekte aus der Relation entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Sortieren" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Die markierten Relationmitglieder oder die gesamte Liste sortieren" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Nach unten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Ausgewählte Elemente nach unten schieben" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Elemente herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "Elemente: {0} (verbunden: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relationseditor: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "Relationselemente herunterladen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Es traten {0} Konflikte während des Imports auf." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "Konflikte in den Daten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" -"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "Erzeuge neue Relation in Ebene \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "Ändere neue Relation in Ebene \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" msgstr "Ändere Relation {0} in Ebene \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Auswahl laden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +#, fuzzy +msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "" +"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4615,5 +5381,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4623,25 +5389,22 @@ msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Eigenschaften von bis zu {0} Objekt aktualisieren" -msgstr[1] "Eigenschaften von bis zu {0} Objekten aktualisieren" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Bitte wählen Sie zuerst die gewünschten Koordinaten." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Bitte geben Sie einen Namen für den Ort an." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Ort ändern" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Bitte wählen Sie erst ein Lesezeichen." @@ -4676,34 +5439,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Datenquellen und Typen" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Als neue Ebene laden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Bereich laden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Bitte einen Suchbegriff eingeben" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Kann die Ergebnisse der Ortssuche nicht vom Server laden" @@ -4711,5 +5474,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Bitte einen Ortsnamen eingeben, nach dem gesucht werden soll:" @@ -4717,5 +5480,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4723,6 +5486,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "Name" @@ -4761,6 +5524,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4783,15 +5546,15 @@ msgstr "Typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "bei" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "Zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4803,5 +5566,5 @@ "Auswahl: Klick." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Interaktive Karte" @@ -4833,5 +5596,11 @@ msgstr "Historie für {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Dialog schließen" @@ -5581,5 +6350,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5748,59 +6517,59 @@ msgstr "Version" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Bilder für {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "GPX lesen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Keine Zeit für Punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Einlesen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Georeferenzierte Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS Start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS Ende: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "Aktueller Unterschied: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "Zeitzonen Unterschied: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5808,138 +6577,128 @@ msgstr[1] "Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} innerhalb der GPS-Spur." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Uhrzeit synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-Bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Zeit mit GPS-Gerät synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "GPS-Punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Linienaussehen anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Globale Einstellungen verwenden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Linien zwischen Punkten dieser Ebene zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Linienaussehen wählen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Farben anpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Voreinstellung" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Farbe auswählen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Marken von benannten Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Benannte GPS-Punkte von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Audio importieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Audio-Dateien im Wave-Format (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Audio-Marken von {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Bilder importieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5948,5 +6707,5 @@ msgstr[1] "{0} GPS-Spuren, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5955,5 +6714,5 @@ msgstr[1] "{0} Routen, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5962,30 +6721,30 @@ msgstr[1] "{0} Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Beschreibung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Zeitspanne: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Länge: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Zur Daten-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5995,43 +6754,43 @@ "
Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Konvertiert von: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} Meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -6042,5 +6801,5 @@ "fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -6048,5 +6807,5 @@ "werden kann." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6056,5 +6815,5 @@ "wurden ignoriert oder an den Anfang verschoben." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6064,48 +6823,48 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} gelöscht.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6130,5 +6889,5 @@ msgstr[1] "GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6136,5 +6895,5 @@ msgstr[1] "Punkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6143,5 +6902,5 @@ msgstr[1] "Eine GPS-Spur mit {0} Punkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6150,5 +6909,5 @@ msgstr[1] "{0} besteht aus {1} GPS-Spuren" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6167,5 +6926,5 @@ msgstr[1] "Wegpunkte" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6174,9 +6933,9 @@ msgstr[1] "{0} besteht aus {1} Wegpunkten" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Ton synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6185,20 +6944,20 @@ "Synchronisationston hören." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Ton synchronisiert bei Punkt {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Sychronisation in Abspielebene nicht möglich." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Audio-Marke an der aktuellen Abspielposition einfügen" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6208,5 +6967,5 @@ "die Marke eingefügt werden soll." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" @@ -6214,6 +6973,13 @@ "Offset abgeleitet werden könnte." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Texte/Symbole anzeigen/verbergen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6223,5 +6989,5 @@ "Aufnahme abgespielt werden soll (nach der ersten Marke)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6231,29 +6997,29 @@ "sychronisierende Audio-Marke oder den Wegpunkt bewegt werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Konnte Audio-Marke nicht synchronisieren." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Fehler beim Anzeigen der URL für diesen Wegpunkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(Die URL lautet: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Fehler beim Anzeigen der URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Erweiterte Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Einstellungseinträge direkt setzen. Bitte vorsichtig benutzen!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6261,27 +7027,27 @@ msgstr "Suche: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Aktueller Wert ist Standard." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Standardwert ist ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6289,14 +7055,14 @@ msgstr "Neuer Wert für {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Bitte wählen Sie die zu löschende Zeile." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen." @@ -6436,40 +7202,40 @@ msgstr "Kalibrierung der Tonaufzeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farbe" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Zeichenstil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Ebene: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Wählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Eine Farbe für {0} auswählen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Voreinstellung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Voreinstellung für alle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Farben, die von verschiedenen Objekten in JOSM verwendet werden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Farben" @@ -6816,46 +7582,55 @@ msgstr "Benutzter Stil" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Verfügbare Plugins bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Liste laden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Aktualisieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Seiten konfigurieren..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Bitte einen Eintrag wählen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "JOSM-Pluginbeschreibungsdatei ändern." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Pluginquellen bearbeiten" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Anzeige-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6863,29 +7638,29 @@ msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Verbindungseinstellungen zum OSM-Server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Karten-Einstellungen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Audio-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 audio player and audio markers." msgstr "Einstellungen für den Audio-Player und Audio-Marken." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam." @@ -6991,59 +7766,61 @@ msgstr "Tastaturkürzel" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "Kurzbeschreibung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Webseite: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "Symbolpfad" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "Standard kopieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Bitte wählen Sie eine Zeile zum Kopieren." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "XML-Einstellungsdatei (URL oder Dateiname) für {0} Definitionen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "Neue XML-Quelle zur Liste hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Ausgewählte Quelle aus der Liste entfernen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "Standard (siehe Tooltip für detailierte Informationen)" @@ -7232,33 +8009,33 @@ msgstr "Steuertastengruppen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Mehr Informationen zu dieser Vorlage" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Optionale Attribute:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Verwende Vorlage \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "geschlossener Weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7269,15 +8046,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Einlesen von {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente des Typs {0} werden unterstützt." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7287,18 +8064,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -7309,33 +8086,36 @@ msgstr "Vorlagengruppe \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Verbindung zum OSM-Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Punkte {0} bis {1} werden heruntergeladen..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "OSM-Daten herunterladen..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, vielleicht fehlende Merkmale." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Daten werden vorbereitet...." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kann \"{0}\" nicht lesen" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7343,21 +8123,21 @@ msgstr "GPX-Dateien" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Wegpunkte von {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Die Datei \"{0}\" existiert nicht" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7375,10 +8155,29 @@ "daher unklar." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "OSM-Daten herunterladen..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID \"{0}\" ausgelassen wegen Serverantwort Nummer 404" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7386,48 +8185,47 @@ msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183-Dateien" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Importierte Koordinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Ungültige Datensätze: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Prüfsummenfehler: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Unbekannte Datensätze: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Leere Koordinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA-Einlesen erfolgreich" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA-Einlesen fehlgeschlagen!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7438,15 +8236,15 @@ "bis {1} unterstützt." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7456,23 +8254,36 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Öffne Änderungssatz..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Schließe Änderungssatz..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Daten hochladen..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Verzeichnis {0} untersuchen" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7516,9 +8327,4 @@ msgstr "Anmelden" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Abbrechen..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7579,43 +8385,47 @@ "OsmPrimitivTyp" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "Lese OSM-Verlaufsdaten ein..." + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Fehler beim Parsen." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM-Server-Dateien" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Unbekannte Version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Fehlende Versionsnummer in OSM-Daten" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Unbekannte Version: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Ein Element in einem Nicht-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " hat Null ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "-Schlüssel bei einer Nicht-Relation gefunden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Fehlendes \"ref\"-Attribut bei Element der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" @@ -7623,10 +8433,10 @@ "Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Fehlendes \"type\"-Attribut bei Element {0} der Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." @@ -7635,13 +8445,13 @@ "Relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Unvollständige -Beschreibung mit ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Illegales Objekt mit id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7650,29 +8460,50 @@ "Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Fehlendes \"version\"-Attribut bei OSM-Objekt mit ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, fuzzy, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" +"Weg {0} als unvollständig markiert, weil referenzierte Knoten in den " +"geladenen Daten fehlen" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "OSM-Daten werden vorbereitet...." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Falsch formatierte Knoten-ID" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "Parameter ''{0}'' > 0 verlangt. Erhielt {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "Lade referenzierende Wege herunter..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "Lade referenzierende Relationen herunter..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" @@ -7680,18 +8511,18 @@ "nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Historie herunterladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Serververbindung..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Verbindung zu API {0} konnte nicht geöffnet werden" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7700,5 +8531,18 @@ "Internetverbindung." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7710,16 +8554,11 @@ "verarbeiten. Ignorieren der Änderungssätze." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} verbleiben. Überspiele {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Plugins aktualisieren" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Plugins herunterladen" @@ -7736,5 +8575,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7743,23 +8582,23 @@ msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Plugin {0} herunterladen..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Herunterladen überspringen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Für Plugin {1} wird JOSM-Version {0} benötigt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Plugin herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Herunterladen überspringen" @@ -7770,34 +8609,32 @@ msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Warnung - Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht " "mehr benötigt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nicht gefunden: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7807,12 +8644,12 @@ "Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Plugin abschalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -7820,9 +8657,9 @@ "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Plugin behalten" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7832,5 +8669,5 @@ "die Rechte besitzt die vorhandenen Plugins zu überschreiben." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7840,10 +8677,10 @@ "ausgelöst haben könnte." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7852,9 +8689,9 @@ "Plugins, bevor Sie den Fehler melden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Soll das Plugin abgeschaltet werden?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7864,27 +8701,23 @@ "um das Plugin zu entfernen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Das Plugin konnte nicht entfernt werden. Bitte melden Sie dieses Problem den " -"Verwaltern Ihres JOSM-Pakets." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Information" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Keine Plugin-Informationen gefunden." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "keine Beschreibung verfügbar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Mehr Details" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7893,13 +8726,18 @@ msgstr[1] "Plugin-Informationen von {0} Quellen geladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Keine Plugin-Informationen gefunden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Alle installierten Plugins sind aktuell." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7912,9 +8750,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Fehlende Plugins herunterladen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7927,57 +8765,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "unbekannt" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin mit JOSM ausgeliefert" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Fehler beim Lesen der Plugin-Informationsdatei: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Ende der Aufzeichnung überschritten" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Fehler bei der Klangausgabe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Keine Aktion" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Programmfehler melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7991,14 +8807,14 @@ "von JOSM einsetzen, würden wir uns über einen Fehlerbericht freuen." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Unerwarteter Fehler" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Bitte melden Sie den Fehler unter {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8006,5 +8822,5 @@ "notwendigen Schritte bei!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8014,17 +8830,35 @@ "sowie aller Plugins, bevor Sie den Fehler melden." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Stellen Sie sicher, dass folgende Informationen enthalten sind:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Nicht noch einmal zeigen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"Für die Sprache {0} konnte keine Übersetzung gefunden werden. Es wird {1} " +"genutzt." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -8038,5 +8872,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -8046,5 +8880,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -8055,13 +8889,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Wegegitter erstellen" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8071,21 +8920,21 @@ "verschiedene Punkte und einen gemeinsamen haben." -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Zwei Wege mit einem gemeinsamen Knoten wählen" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Zwei Wege mit maximal einem gemeinsamen Knoten wählen" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Ein Wegegitter erstellen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "GPS-Spur hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8093,75 +8942,76 @@ msgstr "GPS-Spuren hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Öffentlich" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Beschreibung" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Bitte Beschreibung für die GPS-Spur angeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Bitte Stichworte für die GPS-Spur angeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Gewählte GPS-Spur: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Verbinden..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Hochladen abgebrochen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Fehler beim Hochladen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-Hochladen war erfolgreich" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "GPS-Spur hochladen: {0}% ({1} von {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Keine Beschreibung angegeben. Bitte Beschreibungstext ergänzen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Keine GPX-Ebene gewählt. Kann GPS-Spur nicht hochladen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Kein Nutzername angegeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Kein Passwort angegeben." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPS-Spur hochladen" @@ -8231,33 +9081,34 @@ msgstr "Eine der ausgewählten Datei war leer!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Photos lesen..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Verzeichnis {0} untersuchen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Leere Datei im Verzeichnis {0} gefunden\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Mit GPX korrelieren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8277,15 +9128,15 @@ msgstr "GPX-Dateien (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Fehler beim Einlesen von {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8297,34 +9148,34 @@ "dem Foto und wählen eine Zeitzone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Fotozeit (aus EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "GPS-Zeit (aus obigem Photo): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Ich bin in der Zeitzone von: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Kein Datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Ein anderes Foto öffnen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Zeit von Foto und GPS-Empfänger synchronisieren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8334,29 +9185,29 @@ "Bitte verwenden Sie das geforderte Format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Ungültiges Datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPS-Spur: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Eine andere GPS-Spur laden" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Zeitzone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Offset:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8364,41 +9215,41 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Position aktualisieren für: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Alle Bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Bilder ohne EXIF-Position" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Noch nicht referenzierte Bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Bilder mit GPS-Spur korrelieren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Korrelieren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Automatisch ermitteln" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Wählen Sie eine GPS-Spur" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Keine GPS-Spur gewählt" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8409,9 +9260,9 @@ "Erwartetes Format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Ungültige Zeitzone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8422,26 +9273,26 @@ "Erwartetes Format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Ungültiger Offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPS-Spur geladen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Die gewählten Bilder enthalten keine Zeitinformation." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Bilder enthalten keine Zeitinformation" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8450,39 +9301,39 @@ "andere." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPS-Spur enthält keine Zeitinformationen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Zeitzone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minuten: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekunden: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Zeitdifferenz von {0} Tagen)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8493,13 +9344,13 @@ "synchonisieren." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Zeitzone und Offset anpassen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Standardwerte" @@ -8521,5 +9372,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" @@ -8542,6 +9393,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Ungültige URL." @@ -8727,22 +9578,22 @@ msgstr "Merkmal \"source=...\" zu Elementen hinzufügen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "{0} herunterladen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Verbinde zu WMS-Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Gebäude erstellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8752,6 +9603,6 @@ "Importgröße für Gebäude auf 1 Quadratkilometer begrenzt." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" @@ -8759,13 +9610,13 @@ "Millisime (Jahr)." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "SVG-Dimensionen extrahieren..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Optimale Dimensionen extrahieren..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Grenze erstellen" @@ -8882,6 +9733,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Leere Ebene" @@ -8910,5 +9761,5 @@ msgstr "Kommunen-Koordinatenfenster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8920,9 +9771,9 @@ "Erzeuge eine neue Datei." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Zwischenspeicher-Formatfehler" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -8931,5 +9782,5 @@ "inkompatibel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Lambert-Zonenfehler zwischenspeichern" @@ -8983,7 +9834,7 @@ "Remove the area from the relation before splitting it." msgstr "" -"Das gewählte Gebiet kann nicht geteilt werden, da es Mitglied einer Relation " +"Das gewählte Gebiet kann nicht geteilt werden, da es Element einer Relation " "ist.\n" -"Entfernen Sie das Gebiet vorm Aufteilen aus der Relation." +"Entfernen Sie das Gebiet vor dem Aufteilen aus der Relation." #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33 @@ -9020,4 +9871,9 @@ msgstr "Kann einen ungeordneten Weg nicht duplizieren." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Keine Daten geladen." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -9028,9 +9884,9 @@ msgstr "Weg duplizieren" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Ebene zum Änderung von GPS-Spuren" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "In GPX-Ebene mit anonymer Zeit konvertieren" @@ -9151,30 +10007,30 @@ msgstr "Daten nach Import löschen" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Daten vom Gerät importieren." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Daten vom DG100 importieren..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Fehler beim Löschen der Daten." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Importiere Daten von {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Keine Daten im Gerät gefunden." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Verbindung fehlgeschlagen." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9186,14 +10042,14 @@ "raphael-mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat-Import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Daten vom Globalsat-Datenlogger DG100 in eine GPS-Ebene importieren." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importieren" @@ -9284,40 +10140,40 @@ msgstr "Bilder mit ImageWayPoint öffnen" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Richtungsindex '{0}' nicht gefunden" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Das Startgebiet ist nicht innerhalb der Begrenzung" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Nach Küstenlinie suchen..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "Bis jetzt {0} Knoten..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Fehler beim Erstellen des Speichers: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Abzeichnen" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "Speicher prüfen..." @@ -9326,26 +10182,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Knotenpunktreduktion durchführen..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Douglas-Peucker-Näherung durchführen..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Doppelte Knoten entfernen..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lake Walker Spur" @@ -9430,7 +10278,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "Wasser" @@ -9588,9 +10436,9 @@ msgstr "Einstellungen für das LakeWalker-Plugin" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Bildkachel herunterladen..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kann Bild nicht laden" @@ -9846,18 +10694,18 @@ msgstr "Unbekannter Status des Fehlers" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Sichtbare öffnen..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Nur Dateien öffnen, die in der aktuellen Ansicht sichtbar sind." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Keine Daten sichtbar, kann Grenzen nicht bestimmen!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9884,33 +10732,33 @@ msgstr "Firefox-Programm" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "Daten vom API herunterladen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "Auswahl ändern" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "Ansicht wechseln" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "Alle Fernsteueraktionen manuell bestätigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Fernbedienung" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Einstellungen für das Fernbedienungs-Plugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9922,28 +10770,28 @@ "Anwendungen adressiert werden muss, die das Plugin nutzen." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Erlaubte Aktionen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Die Fernsteuerung soll Daten vom API herunterladen." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Details der Anfrage: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Soll dies erlaubt werden?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Fernsteueraktion bestätigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:" @@ -10208,4 +11056,28 @@ msgstr "Hervorheben" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Eigenschaften von bis zu {0} Objekt aktualisieren" +msgstr[1] "Eigenschaften von bis zu {0} Objekten aktualisieren" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" +"INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet()" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" +"Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() " +"gefunden." + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10463,33 +11335,33 @@ msgstr "Einen Dialog zum Springen an eine spezifische Position öffnen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Länge und Breite der Sprungposition angeben." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Sie können auch eine URL von www.openstreetmap.org einfügen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (in Meter)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Dorthin springen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Zu Position springen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Länge, Breite oderZoom konnten nicht gelesen werden. Bitte prüfen." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Länge oder Breite nicht lesbar" @@ -10525,6 +11397,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Ergebnisse der Datenprüfung" @@ -10534,10 +11406,10 @@ msgstr "Keine Fehler gefunden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Raster" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10628,23 +11500,15 @@ msgstr "Datenprüfung ausführen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Die Daten enthalten Fehler. Trotzdem hochladen?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Fenster mit dem Ergebnis der Prüfung öffnen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoom auf Problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Prüfen" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Aktuelle Auswahl oder den kompletten Datensatz prüfen." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10717,22 +11581,22 @@ msgstr "Überschneidende Wege" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Doppelte Knoten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Knoten doppelt im Weg." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Prüft auf Wege mit identischen aufeinanderfolgenden Knoten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Knoten doppelt im Weg" @@ -10812,23 +11676,23 @@ "könnte." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Eigenschaftsprüfer:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ungültige Zeile im Merkmalsprüfer - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ungültige Zeile im Rechtschreibprüfer: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10839,7 +11703,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Ungültige Schlüssel/Wert-Kombinationen" @@ -10847,78 +11711,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Zeichenproblem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Schlüssel \"{0}\" ungültig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Merkmale mit leerem Wert" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Ungültiger Schlüssel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Ungültiger Leerraum in Schlüssel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Werte beginnen oder enden mit Leerraum" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Werte enthalten HTML-Entität" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Schlüssel \"{0}\" nicht in Vorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Vorlagen enthalten Schlüssel nicht" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Vorlagen enthalten Wert nicht" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "Korrekturnotizen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Schlüssel prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Komplexen Eigenschaftsprüfer verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Datenquelle für Merkmalsprüfer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10928,29 +11794,29 @@ "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Eine neue Quelle zur Liste hinzufügen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Ausgewählte Quelle bearbeiten." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Datenquellen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Werte überprüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Prüft die Gültigkeit von Werten anhand von Objektvorlagen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Auf Korrekturnotizen prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -10958,55 +11824,55 @@ "(fixme) stehen haben." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Zeichennotizen prüfen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Standarddatendatei verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Nutzung der Standarddatendatei (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "Standarddatei zum Merkmale ignorieren verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Standarddatei für Schreibprüfung verwenden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Eigenschaften korrigieren" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Konnte Elementtyp nicht finden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Konnte Warnlevel nicht finden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ungültiger Ausdruck \"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11151,7 +12017,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "Gebäude" @@ -11165,5 +12031,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "Fläche" @@ -11199,10 +12065,10 @@ msgstr "Verbundenes Wegende nahe anderem Weg" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Knoten ohne Merkmale und ohne Verbindung" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11260,8 +12126,38 @@ msgstr "Verdrehtes Land: Land nicht auf der linken Seite" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "Gescannte Karte..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" +"Zeige eine Karte die vorher gescannt und auf walking-papers.org hochgeladen " +"wurde." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" +"Geben Sie eine walking-papers.org URL oder ID (das Bit nach ?id= in der URL) " +"an" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" +"Konnte die Informationen von walking-papers.org mit der id \"{0}\" nicht " +"lesen" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11272,10 +12168,10 @@ msgstr "Startknoten an einem Wegende auswählen" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Ende des Pfades erreicht" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Kreuzung erreicht" @@ -11347,14 +12243,14 @@ msgstr "Hilfe für WMS-Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Berichtigtes Bild..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Berichtigte Bilder von verschiedenen Diensten herunterladen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11365,26 +12261,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Angepasste WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Unterstützte Berichtigungsservices:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Webseite besuchen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS-URL oder Bild-ID:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Berichtigtes Bild hinzufügen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11394,5 +12290,5 @@ "zugeordnet werden. Bitte versuchen Sie es erneut." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Keine gültige WMS-URL oder ID" @@ -11402,5 +12298,5 @@ msgstr "Die Position der gewählten WMS-Ebene anpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11411,19 +12307,19 @@ "nicht identisch. Das kann zu falschen Koordinaten führen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatisches Laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11432,88 +12328,88 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Einstellungen für WMS-Plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menüname" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Menüname (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS-URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Standard kopieren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Herunterladeprogramm:" @@ -11640,11 +12536,16 @@ "GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "Visualisiert Routeninformationen als Routengraph." + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11657,10 +12558,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Hilfe beim Vektorisieren von WMS-Bildern." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11670,5 +12571,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11681,5 +12582,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11692,15 +12593,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Zeigt ein OpenLayers Hintergrundbild" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importiert Berichte von OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11710,5 +12611,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11717,5 +12618,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11726,15 +12627,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Das großartige Plastic-Design von JGoodies." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11745,10 +12646,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Bietet Routenführungsmöglichkeiten." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11759,15 +12660,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Bietet einen Dialog um Merkmale in einer Tabelle zu editieren." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11780,10 +12681,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Erstellt Reihenhäuser aus einem Häuserblock." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11795,5 +12696,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11804,5 +12705,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11813,11 +12714,21 @@ "Schlüsselnamen ist integriert." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" +"Unterstützt das Herunterladen von gescannten Karten von walking-papers.org. " +"Dieses Plug-in ist noch in einer frühen Entwicklungsphase und kann " +"fehlerhaft sein." + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12974,58 +13885,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -13039,6 +13898,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Autobahn" @@ -13064,6 +13923,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "Schnellstraße" @@ -13089,6 +13948,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "Bundesstraße" @@ -13114,6 +13973,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "Landesstraße" @@ -13127,5 +13986,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "Kreisstraße" @@ -13143,5 +14002,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "Ortsstraße" @@ -13175,6 +14034,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "Service" @@ -13201,6 +14060,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "Baustelle" @@ -13250,5 +14109,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "Kreisverkehr" @@ -14227,5 +15086,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "Marsch" @@ -15956,27 +16815,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "Sport" @@ -18815,7 +19674,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "Fahrrad" @@ -18885,7 +19744,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "Fuß" @@ -18911,5 +19770,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "U-Bahn" @@ -19400,13 +20259,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "veraltet" @@ -19448,5 +20307,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "Pferd" @@ -19666,4 +20525,66 @@ msgstr "Barriere" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Kraftfahrstraße" + #. color tertiary #. @@ -19698,6 +20619,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "Straße" @@ -19753,7 +20674,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "Weg" @@ -19809,8 +20730,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "Eisenbahn" @@ -19831,5 +20752,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "Service" @@ -19843,5 +20764,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "Furt" @@ -19862,5 +20783,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "Wendekreis" @@ -19875,5 +20796,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "Notfallrettungspunkt" @@ -19888,5 +20809,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "Flussufer" @@ -19900,5 +20821,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "Fluss" @@ -19912,5 +20833,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "Dock" @@ -19938,5 +20859,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "Aquädukt" @@ -20104,13 +21025,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "Zivilisationsbauten" @@ -20172,7 +21093,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "Eisenbahnpunkt" @@ -20195,10 +21116,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "Andere Bahnen" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "Eisenbahn-Überlagerung" @@ -20234,7 +21155,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "Alte Eisenbahn" @@ -20279,6 +21200,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "Rollweg" @@ -20292,5 +21213,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "Terminal" @@ -20312,5 +21233,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "Rollweg (dunkel)" @@ -20324,5 +21245,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "Rollweg (hell)" @@ -20370,7 +21291,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "Luftweg" @@ -20387,5 +21308,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "Einfache Piste" @@ -20400,5 +21321,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "Mittelschwere Piste" @@ -20413,5 +21334,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "Fortgeschrittenenpiste" @@ -20426,5 +21347,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "Expertenpiste" @@ -20439,5 +21360,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "freie Piste" @@ -20452,5 +21373,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "Anfängerpiste" @@ -20555,10 +21476,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "Strom" @@ -20572,5 +21493,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "Anlegestelle (Pier)" @@ -20584,5 +21505,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "Pipeline" @@ -20710,12 +21631,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "Freizeit" @@ -20729,5 +21650,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "Jachthafen" @@ -20799,8 +21720,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "Einrichtungen" @@ -20902,10 +21823,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "Verkehrseinrichtungen" @@ -21291,22 +22212,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "Einrichtungen (hell)" @@ -21338,6 +22259,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "Wasser (hell)" @@ -21398,8 +22319,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "Gesundheit" @@ -21752,26 +22673,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "Geschäft" @@ -21843,8 +22764,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "Hotel" @@ -21994,9 +22915,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "Tourismus" @@ -22068,8 +22989,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "Historisch" @@ -22140,8 +23061,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "Grün" @@ -22155,5 +23076,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "Steinbruch" @@ -22167,5 +23088,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "Mülldeponie" @@ -22187,5 +23108,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "Wasserbecken" @@ -22199,5 +23120,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "Forst" @@ -22211,5 +23132,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "Farmland" @@ -22232,5 +23153,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "Einkaufsbereich" @@ -22244,5 +23165,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "Industriegebiet" @@ -22256,5 +23177,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "Baulücke" @@ -22268,5 +23189,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "Bauland" @@ -22280,5 +23201,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "Eisenbahnland" @@ -22335,7 +23256,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "Militär" @@ -22349,5 +23270,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "Friedhof" @@ -22360,5 +23281,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "Berggipfel" @@ -22373,5 +23294,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "Gletscher" @@ -22385,5 +23306,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "Vulkan" @@ -22438,8 +23359,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "Natur" @@ -22453,5 +23374,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "Buschland" @@ -22465,5 +23386,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "Heide" @@ -22477,5 +23398,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "Naturwald" @@ -22489,5 +23410,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "Schlick & Moor" @@ -22501,5 +23422,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "Strand" @@ -22577,8 +23498,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "Route" @@ -22626,7 +23547,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "Grenze" @@ -22768,10 +23689,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "Ort" @@ -22819,6 +23740,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "Adresse" @@ -22968,5 +23889,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "Unbennante klassenlose Straße" +msgstr "Unbenannte klassenlose Straße" #. way : W : highway == unclassified && name != * @@ -23115,18 +24036,78 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Datenebene" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "API-Initialisierung fehlgeschlagen - bitte später versuchen" + +#~ msgid "API initialization failed" +#~ msgstr "API-Initialisierung fehlgeschlagen" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Keine Daten zum Aktualisieren gefunden. Haben Sie bereits eine Datenebene " +#~ "heruntergeladen oder geöffnet?" + +#~ msgid "No data" +#~ msgstr "Keine Daten" + +#~ msgid "Failed to update the selected primitives." +#~ msgstr "Fehler beim Hochladen der gewählten Objekte" + +#~ msgid "Update failed" +#~ msgstr "Aktualisierung fehlgeschlagen" + +#~ msgid "Missing primitive" +#~ msgstr "Objekt fehlt" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Unvollständiges anwenden" + +#~ msgid "Layers: {0}" +#~ msgstr "Ebenen: {0}" + +#~ msgid "Conflict created" +#~ msgstr "Ein Konflikt wurde erstellt" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "" +#~ "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen." + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Das Plugin konnte nicht entfernt werden. Bitte melden Sie dieses Problem " +#~ "den Verwaltern Ihres JOSM-Pakets." + +#~ msgid "Validate" +#~ msgstr "Prüfen" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Aktuelle Auswahl oder den kompletten Datensatz prüfen." #~ msgid "Not implemented yet." #~ msgstr "Noch nicht implementiert." -#~ msgid "Resolve Conflicts" -#~ msgstr "Konflikte auflösen" - -#~ msgid "There were conflicts during import." -#~ msgstr "Es sind Konflikte beim Importieren aufgetreten." - #~ msgid "Object" #~ msgstr "Objekt" + +#~ msgid "unnamed" +#~ msgstr "unbenannt" + +#~ msgid "position" +#~ msgstr "Position" + +#~ msgid "different" +#~ msgstr "unterschiedlich" + +#~ msgid "true" +#~ msgstr "wahr" + +#~ msgid "false" +#~ msgstr "falsch" + +#~ msgid "Rotate" +#~ msgstr "Drehen" #~ msgid "{0} object has conflicts:" @@ -23144,30 +24125,9 @@ #~ msgstr "neue Version:" -#~ msgid "position" -#~ msgstr "Position" - -#~ msgid "different" -#~ msgstr "unterschiedlich" - -#~ msgid "true" -#~ msgstr "wahr" - -#~ msgid "false" -#~ msgstr "falsch" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "{0} Konflikte in {1} Objekten auflösen" - -#~ msgid "Change" -#~ msgstr "Ändern" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren" +#~ msgid "Date" +#~ msgstr "Datum" #~ msgid "Revert" #~ msgstr "Rückgängig" - -#~ msgid "Date" -#~ msgstr "Datum" #~ msgid "" @@ -23178,53 +24138,57 @@ #~ "Versionsliste ausgewählt ist." -#~ msgid "Rotate" -#~ msgstr "Drehen" +#~ msgid "Occupied By" +#~ msgstr "Belegt durch" + +#~ msgid "Error parsing server response." +#~ msgstr "Fehler beim Parsen der Serverantwort." + +#~ msgid "Cannot connect to server." +#~ msgstr "Kann nicht mit Server verbinden." + +#~ msgid "image not loaded" +#~ msgstr "Bild nicht geladen" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Einige der Knoten sind (fast) in einer Linie" + +#~ msgid "Data Layer" +#~ msgstr "Datenebene" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "Yahoo (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "Yahoo (GNOME/NetPBM)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "Yahoo (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "Yahoo (WebKit GTK)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Tagging preset sources" +#~ msgstr "Quellen für Objektvorlagen" + +#~ msgid "Tagging preset source" +#~ msgstr "Quelle für Objektvorlagen" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen." #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Merkmale (leerer Wert löscht das Merkmal)" -#~ msgid "Error parsing server response." -#~ msgstr "Fehler beim Parsen der Serverantwort." - -#~ msgid "Cannot connect to server." -#~ msgstr "Kann nicht mit Server verbinden." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Sie können die Maus oder Strg+Pfeiltasten benutzen um zu zoomen und zu " -#~ "verschieben." - -#~ msgid "Tagging preset source" -#~ msgstr "Quelle für Objektvorlagen" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen." - -#~ msgid "Tagging preset sources" -#~ msgstr "Quellen für Objektvorlagen" - -#~ msgid "image not loaded" -#~ msgstr "Bild nicht geladen" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "Yahoo (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "Yahoo (GNOME/NetPBM)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "Yahoo (WebKit)" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Einige der Knoten sind (fast) in einer Linie" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "Yahoo (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" +#~ msgid "Contacting the OSM server..." +#~ msgstr "OSM-Server kontaktieren..." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren" #~ msgid "Import TCX File..." @@ -23233,4 +24197,16 @@ #~ msgid "Import TCX file as GPS track" #~ msgstr "TCX-Datei als GPS-Spur importieren" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Konflikte auflösen" + +#~ msgid "Change" +#~ msgstr "Ändern" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "{0} Konflikte in {1} Objekten auflösen" + +#~ msgid "Add Selected" +#~ msgstr "Ausgewähltes hinzufügen" #~ msgid "" @@ -23241,4 +24217,45 @@ #~ "Weitere Informationen unter http://josm.openstreetmap.de/wiki/" #~ "TaggingPresets" + +#~ msgid "Aborting..." +#~ msgstr "Abbrechen..." + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikte: {0}" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n" + +#~ msgid "Remove Selected" +#~ msgstr "Ausgewähltes entfernen" + +#~ msgid "Basic" +#~ msgstr "Standard" + +#~ msgid "Move Up" +#~ msgstr "Nach oben" + +#~ msgid "Move Down" +#~ msgstr "Nach unten" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relationseditor: {0}" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Bitte mindestens einen Knoten, Weg oder Relation wählen. Nur bereits " +#~ "hochgeladene Elemente haben eine Geschichte." + +#~ msgid "There were conflicts during import." +#~ msgstr "Es sind Konflikte beim Importieren aufgetreten." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "TCX-Dateien direkt aus JOSM heraus laden." + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Alle ausgewählten Objekte als Elemente hinzufügen" #~ msgid "" @@ -23254,20 +24271,4 @@ #~ "Sie keinen französischen WMS-Server nutzen.\n" #~ "Laden Sie nach dieser Nachricht keine Daten hoch." - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikte: {0}" - -#~ msgid "Solve Conflict" -#~ msgstr "Konflikte lösen" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Bitte mindestens einen Knoten, Weg oder Relation wählen. Nur bereits " -#~ "hochgeladene Elemente haben eine Geschichte." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "TCX-Dateien direkt aus JOSM heraus laden." #~ msgid "" @@ -23286,4 +24287,7 @@ #~ "Laden Sie nach dieser Nachricht keine Daten hoch." +#~ msgid "linked" +#~ msgstr "verbunden" + #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Bild mit Pfad {0} existiert nicht oder ist nicht lesbar." @@ -23301,21 +24305,45 @@ #~ msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = " +#~ msgid "Selection too big" +#~ msgstr "Auswahl zu groß" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Sie können die Maus oder Strg+Pfeiltasten benutzen um zu zoomen und zu " +#~ "verschieben." + +#~ msgid "Error when communicating with server." +#~ msgstr "Fehler bei der Kommunikation mit dem Server." + +#~ msgid "Undeleting relation..." +#~ msgstr "Relation wiederherstellen..." + #~ msgid "Undeleting Way..." #~ msgstr "Weg wiederherstellen..." +#~ msgid "Delete mine" +#~ msgstr "Meine löschen" + #~ msgid "Checking whether node {0} is gone ..." #~ msgstr "Prüfe ob Knoten {0} gelöscht wurde..." -#~ msgid "Undeleting relation..." -#~ msgstr "Relation wiederherstellen..." +#~ msgid "Keep mine" +#~ msgstr "Meine behalten" #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Prüfe ob Objekt {0} gelöscht wurde..." -#~ msgid "Keep mine" -#~ msgstr "Meine behalten" - -#~ msgid "Delete mine" -#~ msgstr "Meine löschen" +#~ msgid "" +#~ "There are {0} primitives
selected for " +#~ "individual update. Please reduce the selection
to max. {1} primitives." +#~ "" +#~ msgstr "" +#~ "Es sind {0} Objekte für eine
individuelle " +#~ "Aktualisierung ausgewählt.

Bitte maximal {1} Objekte auswählen." + +#~ msgid "Didn't find an historized primitive with id {0} in this dataset" +#~ msgstr "" +#~ "Für das Objekt mit ID {0} wurde im Datensatz keine Geschichte gefunden." #~ msgid "" @@ -23334,23 +24362,19 @@ #~ "
Wählen Sie {3} zum Abbrechen.
" -#~ msgid "" -#~ "There are {0} primitives
selected for " -#~ "individual update. Please reduce the selection
to max. {1} primitives." -#~ "" -#~ msgstr "" -#~ "Es sind {0} Objekte für eine
individuelle " -#~ "Aktualisierung ausgewählt.

Bitte maximal {1} Objekte auswählen." - -#~ msgid "Selection too big" -#~ msgstr "Auswahl zu groß" - -#~ msgid "Didn't find an historized primitive with id {0} in this dataset" -#~ msgstr "" -#~ "Für das Objekt mit ID {0} wurde im Datensatz keine Geschichte gefunden." - -#~ msgid "Error when communicating with server." -#~ msgstr "Fehler bei der Kommunikation mit dem Server." - #~ msgid "image loading..." #~ msgstr "Lade Bild..." + +#~ msgid "WGS84 Geographisch" +#~ msgstr "WGS84 Geografisch" + +#~ msgid "Sort" +#~ msgstr "Sortieren" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Die markierten Relationmitglieder oder die gesamte Liste sortieren" + +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Ebene {0} muss in der Ebenenliste sein" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Elemente: {0} (verbunden: {1})" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 16826) +++ /applications/editors/josm/i18n/po/el.po (revision 16827) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" "PO-Revision-Date: 2009-07-09 11:26+0000\n" "Last-Translator: alichani \n" @@ -16,26 +16,103 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Δημιουργία κύριου GUI" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Σφάλμα" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -43,56 +120,59 @@ "διακομιστή." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Μη αποθηκευμένες αλλαγές" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Αποθήκευση και Έξοδος" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Απόρριψη και Έξοδος" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -101,32 +181,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Ακύρωση" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Προειδοποίηση" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "ΆΓΝΩΣΤΟ" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Περί" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Εμφάνιση του παραθύρου περί" @@ -134,10 +274,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -145,5 +285,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -152,19 +292,19 @@ msgstr "Έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Τελεταία αλλαγή στις {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Έκδοση Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Ιστοσελίδα" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Αναφορές σφαλμάτων" @@ -174,37 +314,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Πληροφορίες" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Διάβασέμε" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Αναθεώρηση" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Συνεισφορά" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Πρόσθετα" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Περί του JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Το αρχείο δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -213,16 +357,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Προειδοποίηση" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -231,7 +368,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Επιλέξτε οποιοδήποτε:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Συγχώνευση Κόμβων" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Προσθήκη Κόμβου..." @@ -243,14 +408,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -258,57 +425,57 @@ msgstr "Επεξεργασία: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Χρησιμοποιήστε δεκαδικές μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Αρνητικές τιμές υποδεικνείουν Δυτικό/Νότιο ημισφαίριο." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Γεωγραφικό πλάτος" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Γεωγραφικό μήκος" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Τακτοποίηση Κόμβων σε Κύκλο" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Μετακίνηση των επιλεγμένων κόμβων σε κύκλο" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -324,25 +491,58 @@ msgstr "Εργαλείο: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "Πληροφορίες" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Ευθυγράμμιση κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Μεταφορά των επιλεγμένων κόμβων σε γραμμή." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Παρακαλώ επιλέξτε τουλάχιστον τρείς κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -353,18 +553,10 @@ "{0}, μέγιστος είναι {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Παραβίαση Δυνατοτήτων API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Αποτυχία αρχικοποίησης API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -373,5 +565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -380,46 +572,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Παραβίαση Προυποθέσεων" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "δεδομένα" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "επίπεδο" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "σύγκρουση" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "λήψη" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Ζουμ στο {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Ζουμ στο {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -429,30 +621,30 @@ msgstr "Προβολή: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Καμοία διένεξη για να γίνει ζουμ" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -460,13 +652,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Επιβεβαίωση συνδυασμού" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Αλλαγή κατευθήνσεων;" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -474,10 +666,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Αντισροφή και Συνδυασμός" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -485,20 +677,20 @@ msgstr "Εισάγετε τιμές για όλες τισ διενέξεις." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Επίλυση διενέξεων" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Όλοι οι δρόμοι ήταν άδειοι" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -515,23 +707,24 @@ msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Δημιουργλια Κύκλου" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Δημιουργία κύκλου από τρείς επιλεγμένους κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -539,88 +732,123 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Διαγραφή" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Διαγραφή επιλεγμένων αντικειμένων." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Αντικατάσταση" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "Το αρχείο υπάρχει. Αντικατάσταση;" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Κατανομή Κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" "Κατανομή των επιλεγμένων κόμβων σε ίσες αποστάσεις κατά μήκος μιας γραμμής." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Λήψη από το OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Αρχείο: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Λήψη" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Σφάλματα κατά την λήψη" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Αντιγραφή" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Αντιγραφή επιλογής με αντιγραφή και άμεση επικόλληση." @@ -640,5 +868,5 @@ msgstr "Έξοδος από την εφαρμογή" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -648,58 +876,73 @@ "τροχιές που είναι υπό την άδεια του GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Εξαγωγή σε GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Τίποτα προς εξαγωγή. Λάβετε κάποια δεδομένα πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "περιγραφή ίχνους gps" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Προσθήκη πληροφοριών συγγραφέα" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Πραγματικό όνομα" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Προκαθορισμένο" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Έτος Copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Λέξεις κλειδιά" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Επιλογές εξαγογής" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Εξαγωγή και Αποθήκευση" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -710,25 +953,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Σφάλμα" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Επιλέξτε μια προκαθορισμένη άδεια" @@ -738,47 +961,50 @@ msgstr "Online βοήθεια του JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Άνοιγμα σε Φυλλομετρητή" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Επεξεργασία" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Επαναφόρτωση" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -814,30 +1040,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Ένωση Κόμβου και Γραμμής" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Καμοία συντόμευση" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Επιβεβαίωση συγχώνευσης" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Συγχώνευση Κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Συγχώνευση κόμβων στον παλαιότερο." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Συγχώνευση κόμβων με διαφορετικές συμμετοχές;" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -847,68 +1083,79 @@ "συγχωνεύσετε;" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Επιβεβαίωση συγχώνευσης" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Συγχώνευση {0} κόμβων" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "επιλογή" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Καθρεπτισμός" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "επάνω" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Μετακίνηση αντικειμένων {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "κάτω" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "αριστερά" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "δεξιά" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Μετακίνηση {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Μεταφέρει αντικείμενα {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου." @@ -916,5 +1163,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Νέα" @@ -924,26 +1171,17 @@ msgstr "Δημιοθργία καινούργιου χάρτη" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "χωρίς όνομα" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Άνοιγμα..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Άνοιγμα αρχείου." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Αδυναμία ανάγνωσης \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -972,22 +1210,22 @@ msgstr "Λήψη URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ορθογωνισμός Σχήματος" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Επιτρέπονται μόνο δύο κόμβοι" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -995,13 +1233,14 @@ "τέσσερις κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Χρησιμοποιείτε την προβολή EPSG:4326 η οποία μπορεί να " @@ -1010,9 +1249,9 @@ "να συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Μόνο ένας κόμβος επιλέχθηκε" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ορθογωνισμός" @@ -1028,11 +1267,11 @@ msgstr "Επικόληση περιεχομένων πρόχειρου." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Επικόλληση ετικετών" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1060,16 +1299,21 @@ msgstr "Επανάληψη της τελευταίας αναίρεσης." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Μετονομασία επιπέδου" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Επιπλέον μετονομασία του αρχείου" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Δεν ήταν δυνατή η μετονομασία του αρχείου \"{0}\"." @@ -1083,9 +1327,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "" @@ -1093,17 +1337,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Αποθήκευση" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Αποθήκευση τεχόντων δεδομένων." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Το αρχείο {0} υπάρχει. Επικάλυψη;" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1113,25 +1359,25 @@ "αναφέρετε το σαν σφάλμα." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Κενό έγγραφο" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Το έγγραφο δεν περιέχει δεδομένα." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Επιβεβαίωση αποθήκευσης" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Συγκρούσεις" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1139,54 +1385,75 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Απόρριψη διενέξεων και Αποθήκευση" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Αποθήκευση αρχείου OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Αποθήκευση αρχείου GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Αποθήκευση Επιπέδου" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Άγνωστη επέκταση αρχείου: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Άγνωστη επέκταση αρχείου." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Αποθήκευση ως..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Επιλογή Όλων" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1219,16 +1486,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Κλείσιμο" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "" @@ -1238,5 +1505,5 @@ msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1244,5 +1511,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1258,9 +1525,9 @@ "επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1268,10 +1535,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1279,17 +1546,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1310,51 +1577,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Επιλέξτε οποιοδήποτε:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Ένας κόμβος με ετικέτα, ή" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1363,5 +1630,5 @@ "χρησιμοποιούνται από περισσότερο από έναν δρόμο." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1371,9 +1638,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Ξεκολημένος Κόμβος" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1381,5 +1648,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1395,29 +1662,29 @@ msgstr "Αναίρεση της τελευταίας ενέργειας." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Αποεπιλογή όλων" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Αποεπιλογή όλων των αντικειμένων" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Ενημέρωση Δεδομένων" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" @@ -1425,113 +1692,61 @@ "λήψη δεδομένων)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα επίπεδο " -"δεδομένων;" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Αποτυχία ενημέρωσης" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "Ενημέρωση Επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Κενή επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Αποστολή προς OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Αντικείμενα που θα προστεθούν:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Αντικείμενα που θα αλλαχτούν" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Αντικείμενα που θα διαγραφούν:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "Να αποσταλούν αυτές οι αλλαγές;" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Αποστολή Αλλαγών" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Γίνεται αποστολή" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Συγχρονισμός μόνο {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1545,17 +1760,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1566,5 +1781,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1573,49 +1788,60 @@ "αναμενόμενο πρότυπο \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Το μήνυμα της ημέρας δεν είναι διαθέσιμο" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Λήψη \"Μηνύματος Ημέρας\"" @@ -3007,62 +3399,57 @@ msgstr "Κωδικός" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "χρήση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "Επιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Εμφάνιση αυτής της βοήθειας" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Επιλογή με την δοθείσα αναζήτηση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Ρυθμίστε την γλώσσα." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "παραδείγματα" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3073,52 +3460,52 @@ "ότι φορτώσατε δεδομένα πριν το --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" "Αντί για το --download= μπορείτε να καθορίσεται το osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Ρύθμιση προκαθορισμένων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Φόρτωση πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Αρχείο" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3126,21 +3513,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Πλήρης Οθόνη" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Ήχος" @@ -3184,53 +3571,68 @@ msgstr "κλίμακα" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Το γεωγραφικό μήκος στο σημείο του ποντικιού." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Το όνομα του αντικειμένου στο σημείο του ποντικιού." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Το γεωγραφικό πλάτος στο σημείο του ποντικιού." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(κανένα αντικείμενο)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "το επίπεδο δεν είναι στη λίστα." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Επικοινωνία με τον διακομιστή OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "Το αρχείο δεν βρέθηκε" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3252,4 +3654,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Αρχικοποίηση" @@ -3281,20 +3684,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Ιδιότητες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Ετικέτες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3302,47 +3705,47 @@ msgstr "Κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3350,25 +3753,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Επίλυση σύγκρουσης" @@ -3405,5 +3808,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Η έκδοση μου" @@ -3414,5 +3817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3426,5 +3829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Η έκδοση τους" @@ -3501,7 +3904,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3576,14 +3978,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3612,10 +4014,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3624,19 +4026,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Η επικοινωνία με τον διακομιστή απέτυχε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Όχι, ακύρωση της λειτουργίας" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3645,9 +4047,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3657,13 +4059,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3671,90 +4073,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(κανένα)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "διαγράφηκε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "μη διεγραμένο" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "ορατό (στον διακομιστή)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "μη ορατό (στον διακομιστή)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Διατήρηση των συντεταγμένων μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Διατήρηση των συντεταγμένων τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Όχι, ακύρωση" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3764,5 +4166,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3787,12 +4189,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3837,10 +4238,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3849,10 +4250,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3861,5 +4262,5 @@ msgstr "Τιμή" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3919,9 +4320,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3929,5 +4330,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3959,42 +4360,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "Εφαρμογή επίλυσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Συνέχεια έτσι κι αλλιώς" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "Συνέχιση επίλυσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, 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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "Εφαρμογή επίλυσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Εφαρμογή μερικών επιλύσεων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "Συνέχιση επίλυσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Επίλυση συγκρούσεων" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4014,97 +4432,130 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "Φόρτωση ιστορικού" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "" #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Επίπεδα" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Διαγραφή του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Διαγραφή οτυ επιπέδου οποσδήποτε;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Διαγραφή Επιπέδου" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλο το επίπεδο;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Πληροφορίες" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ναι" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "Β" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Διαγραφή" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Διαγραφή {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Εμφάνιση/Απόκρυψη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" -"Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Επίπεδα" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "ιδιωτικό" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Διαγραφή του επιλεγμένου επιπέδου." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Επίπεδα: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4113,22 +4564,28 @@ msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Κενή τιμή διαγράφει το κλειδί." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<διαφορετικά>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Αλλαγή τιμών;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4137,85 +4594,90 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Παρακαλώ επιλέξτε κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Παρακαλώ επιλέξτε μια τιμή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Ιδιότητες/Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Ιδιότητες επιλεγμένων αντικειμένων." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Αλλαγή σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Προσθήκη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Επεξεργασία Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Διαγραφή Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Ιδιότητες / Υπαγωγές" @@ -4224,63 +4686,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Άνοιγμα λίστας όλων τον σχέσεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Σχέσεις: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Διαγραφή της επιλεγμένης σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Σημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Σχέσεις: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Διαγραφή της επιλεγμένης σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Τρέχουσα επιλογή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Άνοιγμα παραθύρου λίστας επιλογμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Ζούμ στα επιλεγμένα στοιχεία" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Ανανέωση της λίστας επιλεγμένων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Ζουμ στην επιλογή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Επιλογή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4289,5 +4753,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4296,5 +4760,5 @@ msgstr[1] "{0} σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4305,5 +4769,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4312,144 +4781,410 @@ "αριστερή εργαλειοθήκη." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Συγγραφείς" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" "Άνοιγμα λίστας των ατόμων που εργάζονται πάνω στα απιλεγμένα αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Συγγραφέας" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Συγγραφείς: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Λήψη Περιοχής" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Διαγραφή της επιλεγμένης σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Λήψη εμφανών πλακιδίων" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Σχέσεις" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Λήψη πρόσθετου {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Σχέσεις" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Επανάληψη της τελευταίας αναίρεσης." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Διαγραφή της επιλεγμένης σχέσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Συνέχιση επίλυσης" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Αντικρουόμενη σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Αποθήκευση τεχόντων δεδομένων." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "Εντάξει" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Λήψη μελών" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Σμίκρυνση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Εφαρμογή αλλαγών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Βασικό" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Κατεχόμενο από" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Μετακίνηση Πάνω" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Προσθήκη επιλεγμένων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Αφαίρεση Επιλεγμένων" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Μετακίνηση Κάτω" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Λήψη μελών" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Επεξεργαστής Σχέσεων: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Φόρτωση επιλογής" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4459,5 +5194,5 @@ msgstr "<πολλαπλές>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4467,25 +5202,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Αλλαγή θέσης" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα." @@ -4520,17 +5252,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Πηγές και Τύποι δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Λήψη σαν νέο επίπεδο" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Λήψη Περιοχής" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4538,5 +5270,5 @@ "διακομιστή" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4544,13 +5276,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Εισαγωγή ακολουθίας προς αναζήτηση" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "" @@ -4558,5 +5290,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "" @@ -4564,5 +5296,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4570,6 +5302,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "όνομα" @@ -4608,6 +5340,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4630,15 +5362,15 @@ msgstr "τύπος" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "κοντά" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "ζουμ" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4647,5 +5379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Slippy map" @@ -4677,5 +5409,11 @@ msgstr "Ιστορικό για {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Κλείσιμο του διαλόγου" @@ -5417,5 +6155,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5582,59 +6320,59 @@ msgstr "Έκδοση" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Εικόνες για {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Ανάγνωση GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Ανάγνωση {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Αρχή GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Τέλος GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "διαφορά στη ζώνη ώρας: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5642,138 +6380,128 @@ msgstr[1] "εικόνες" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} μέσα στο ίχνος" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Συγχρονισμός ρολογιού" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Εικόνες JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Εικόνα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "σημείο gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Προσαρμογή του σχεδιασμού γραμμών" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Χρηση καθολικών ρυθμίσεων." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Προσαρμογή Χρώματος" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "Εντάξει" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Προκαθορισμένο" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Επιλέξτε ένα χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Σημάδια από Ονομασμένα Σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Εισαγωγή Ήχου" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Αρχεία Κυματομορφής (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Σημάδια ήχου από {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Εισαγωγή εικόνων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5782,5 +6510,5 @@ msgstr[1] "{0} τροχιές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5789,5 +6517,5 @@ msgstr[1] "{0} διαδρομές, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5796,30 +6524,30 @@ msgstr[1] "{0} σημεία αναφοράς" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Όνομα: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Περιγραφή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Διάρκεια: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Μήκος: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Μετατροπή σε επίπεδο δεδομένων" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5829,43 +6557,43 @@ "βλαβερή.
Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Μετατράπηκε από: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} μέτρα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} τετρ. χλμ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5876,10 +6604,10 @@ "συνεχίσετε;" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" "Δεν υπάρχει διαθέσιμο ίχνος GPX στο επίπεδο για την συσχέτιση με τον ήχο." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5887,5 +6615,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5893,47 +6621,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} διαγράφηκαν.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5958,5 +6686,5 @@ msgstr[1] "ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5964,5 +6692,5 @@ msgstr[1] "σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5971,5 +6699,5 @@ msgstr[1] "ένα ίχνος με {0} σημεία" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5978,5 +6706,5 @@ msgstr[1] "το {0} αποτελείται από {1} ίχνη" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5995,5 +6723,5 @@ msgstr[1] "σημάδια" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6002,9 +6730,9 @@ msgstr[1] "{0} αποτελείται από {1} σημάδια" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Συγχρονισμός ήχου" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6013,20 +6741,20 @@ "συγχρονισμού." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Ήχος συγχρονισμένος στο σημείο {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6034,10 +6762,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" +"Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6045,5 +6781,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6051,30 +6787,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" "Παρουσιάστηκε σφάλμα κατά την προσπάθεια προβολής URL για αυτό το σημάδι" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "Το URL ήταν: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Σφάλμα στην εμφάνιση του URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Προχωρημένες προτιμήσεις" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Απ' ευθείας Ρύθμιση Προτιμήσεων. Χρησιμοποιήστε με προσοχή!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6082,14 +6818,14 @@ msgstr "Αναζήτηση: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Η τρέχουσα τιμή είναι η προεπιλεγμένη." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6097,13 +6833,13 @@ "χρησιμοποιηθεί ακόμα)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6111,14 +6847,14 @@ msgstr "Νέα τιμή για {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής" @@ -6243,40 +6979,40 @@ msgstr "Βαθμονόμηση καταγραφέα ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Χρώμα" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Επίπεδο: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Επιλέξτε" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Επιλέξτε ένα χρώμα για {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Χρώματα που χρησιμοποιούνται από διάφορα αντικείμενα στο JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Χρώματα" @@ -6608,46 +7344,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Ρύθμιση διαθέσιμων πρόσθετων." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Λήψη λίστας" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Ενημέρωση" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Ρύθμιση τοποθεσιών..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Παρακαλώ επιλέξτε μια επιλογή" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Επεξεργασία URL περιγραφής πρόσθετου του JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Επεξεργασία URL περιγραφής πρόσθετου του JOSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Ρύθμιση τοποθεσιών πρόσθετων" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Ρυθμίσεις απεικόνισης" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6656,29 +7401,29 @@ "Διάφορες ρυθμίσεις που επηρρεάζουν την εμφάνιση ολόκληρου του προγράμματος." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Ρυθμίσεις σύνδεσης" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Ρυθμίσεις σύνδεσης για τον διακομηστή OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Ρυθμίσεις Χάρτη" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Ρυθμίσεις για την προβολή χάρτη και την ερμηνεία δεδομένων." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Ρυθμίσεις Ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Ρυθμίσεις για την αναπαραγωγή ήχου και σημαδιών ήχου." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις." @@ -6781,59 +7526,61 @@ msgstr "Συντόμευση" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7002,33 +7749,33 @@ msgstr "Ομάδες τροποποιητών" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Χρήση προεπιλογής \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Άγνωστος τύπος: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7039,15 +7786,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7057,18 +7804,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Εφαρμογή Προεπιλογής" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -7079,33 +7826,36 @@ msgstr "Ομάδα προεπιλογών \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Επικοινωνία με τον διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Μεταφόρτωση σημείων {0} ως {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Μεταφόρτωση δεδομένων OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Προετοιμασία δεδομένων..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Αδυναμία ανάγνωσης \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7113,21 +7863,21 @@ msgstr "Αρχεία GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Σημάδια από {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Το αρχείο \"{0}\" δεν υπάρχει" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7143,10 +7893,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Μεταφόρτωση δεδομένων OSM..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7154,48 +7923,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Αρχεία NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Εισήχθησαν συντεταγμένες: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Κακοσχηματισμένες προτάσεις: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Σφάλματα στο άθροισμα ελέγχου: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Άγνωστες προτάσεις: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Μηδενικές συντεταγμένες: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Επιτυχία εισαγωγής NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Αποτυχία εισαγωγής NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7204,15 +7972,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7220,23 +7988,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Άνοιγμα πακέτου αλλαγών..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Αποστολή..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Σάρωση καταλόγου {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7279,9 +8060,4 @@ msgid "Login" msgstr "Είσοδος" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Διακοπή..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7332,66 +8108,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Αρχεία Διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Άγνωστη έκδοση" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Άγνωστη έκδοση: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " έχει μηδενική αναφορά" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Βρέθηκε στοιχείο εκτός σχέσης." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Άγνωστο αντικείμενο με id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7399,46 +8179,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Προετοιμασία δεδομένων OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Κακοσχηματισμένο id κόμβου" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Λήψη ιστορικού..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Επικοινωνία με τον Διακομιστή..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7447,5 +8247,18 @@ "Internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} απομένουν. Αποστολή {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7454,16 +8267,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} απομένουν. Αποστολή {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Ενημέρωση πρόσθετων" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Λήψη Πρόσθετων" @@ -7480,5 +8288,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7488,23 +8296,23 @@ "{0} πρόσθετα φορτώθηκαν με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Λήψη πρόσθετου {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Απαιτείται η έκδοση {0} του JOSM για το πρόσθετο {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Λήψη Πρόσθετου" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Παράλειψη Λήψης" @@ -7515,34 +8323,32 @@ msgstr "Συνέβη σφάλμα στο πρόσθετο {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Προειδοποίηση - ζητήθηκε η φόρτωση του {0} πρόσθετου. Το πρόσθετο δεν " "χρειάζεται πλέον." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Δεν βρέθηκε το πρόσθετο: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7553,12 +8359,12 @@ "διαμόρφωση.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Απενεργοποίηση πρόσθετου" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -7566,9 +8372,9 @@ "Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Διατήρηση πρόσθετου" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7578,5 +8384,5 @@ "άδεια αντικατάστασης των υπαρχόντων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7586,10 +8392,10 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7598,9 +8404,9 @@ "κάντε αναφορά για bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Να απενεργοποιηθεί το πρόσθετο;" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7610,27 +8416,23 @@ "να αποφορτωθεί το πρόσθετο." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα οποία " -"πήρατε το JOSM για το πρόβλημα." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Πληροφορίες" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "δεν υπάρχει περιγραφή" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Περισσότερες λεπτομέρειες" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7639,13 +8441,18 @@ msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7658,9 +8465,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Λήψη πρόσθετων που λείπουν" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7673,57 +8480,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "άγνωστο" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Έκδοση {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Πρόσθετα που έρχονται με το JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Σφάλμα κατά την ανάγνωση αρχείου πληροφοριών πρόσθετου: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Αυτό είναι το μετά το τέλος της εγγραφής" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Σφάλμα στην αναπαραγωγή ήχου" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Καμία ενέργεια" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Αναφέρετε Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7738,19 +8523,19 @@ "για bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Μη Αναμενόμενη Εξαίρεση" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς γίνεται)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7760,17 +8545,33 @@ "πρόσθετων πριν αναφέρετε bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Βεβαιωθείτε ότι συμπεριλάβατε τις ακόλουθεσ πληροφορίες:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Να μην εμφανιστεί ξανά" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7784,5 +8585,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7792,5 +8593,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7801,13 +8602,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "Συμβουλή: Μπορείτε να αλλάξετε τις συντομεύσεις στις προτιμήσεις" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7815,21 +8631,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Αποστολή Ίχνους" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7837,74 +8653,75 @@ msgstr "Αποστολή ιχνών" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Δημόσιο" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Περιγραφή" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Σύνδεση..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Ακυρώθηκε η αποστολή" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Σφάλμα κατά την αποστολή" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Η αποστολη GPX ήταν επιτυχής" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Η αποστολή απέτυχε. Ο διακομιστής επέστρεψε το παρακάτω μηνυμα: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Αποστολή ίχνους GPX : {0}% ({1} από {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Δεν δώθηκε όνομα χρήστη." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Δεν δώθηκε συνθηματικό." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Αποστολή Ίχνους GPX" @@ -7974,33 +8791,34 @@ msgstr "Ένα από τα επιλεγμένα αρχεία ήταν μηδενικό !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Ανάγνωση φωτογραφιών" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Σάρωση καταλόγου {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8020,15 +8838,15 @@ msgstr "Αρχεία GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Σφάλμα κατά την ερμηνεία {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8037,34 +8855,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Ώρα φωτογραφίας (από exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [ηη/μμ/εεεε ωω:λλ:δδ]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Βρίσκομαι στην ζώνη ώρας: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Χωρίς ημερομηνία" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Άνοιγμα άλλης φωτογραφίας" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8072,29 +8890,29 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Μη έγκυρη ημερομηνία" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Ίχνος GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Άνοιγμα άλλου ίχνους GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Ζώνη Ώρας: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Μετατόπιση:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8102,41 +8920,41 @@ "βοηθήσει;" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Ενημέρωση θέσης για: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Όλες οι εικόνες" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Εικόνες χωρίς θέση exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Συσχέτιση" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Δεν επιλέχθηκε ίχνος GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8145,9 +8963,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Λανθασμένη ζώνη ώρας" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8156,65 +8974,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Ζώνη ώρας: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Λεπτά: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Δευτερόλεπτα: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Διαφορά ώρας {0} ημερών)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8222,13 +9040,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8250,5 +9068,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" @@ -8271,6 +9089,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8438,22 +9256,22 @@ msgstr "Προσθήκη \"source=...\" στα στοιχεία;" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Λήψη {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Επικοινωνία με διακομιστή WMS..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Δημιουργία κτηρίων" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8461,18 +9279,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Δημιουργία ορίου" @@ -8588,6 +9406,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Άδειο επίπεδο" @@ -8616,5 +9434,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8623,14 +9441,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8718,4 +9536,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Δε φορτώθηκαν δεδομένα." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8726,9 +9549,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8849,30 +9672,30 @@ msgstr "διαγραφή δεδομένων μετά την εισαγωγή" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Εισαγωγή δεδομένων από την συσκευή." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Εισαγωγή δεδομένων από το DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Σφάλαμ κατά την διαγραφή των δεδομένων." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "εισήχθησαν δεδομένα από {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Δεν βρέθηκαν δεδομένα στη συσκευή." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Η σύνδεση απέτυχε." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8881,14 +9704,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Εισαγωγή Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Εισαγωγή δεδομένων από Globalsat Datalogger DG100 στο επίπεδο GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Εισαγωγή" @@ -8979,40 +9802,40 @@ msgstr "Άνοιγμα εικόνων με το ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Αναζήτηση ακτογραμμής..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} κόμβοι μέχρι τώρα..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Σφάλμα κατά την δημιουργία καταλόγου cache: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "έλεγχος cache..." @@ -9021,26 +9844,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Αφαίρεση διπλών κόμβων..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Ίχνος Lakewalker" @@ -9125,7 +9940,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "νερό" @@ -9278,9 +10093,9 @@ msgstr "Προτιμήσεις πρόσθετου Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Λήψη πλακιδίου εικόνας..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9526,18 +10341,18 @@ msgstr "Άγνωστη κατάσταση θέματος" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Άνοιγμα Ορατών..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Άνοιγμα μόνο των αρχείων που είναι ορατά στην τρέχουσα προβολή" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9564,33 +10379,33 @@ msgstr "εκτελέσιμο Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "φόρτωση δεδομένων από το API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "αλλαγή της επιλογής" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Απομακρυσμένος έλεγχος" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9599,28 +10414,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Επιτρεπώμενες ενέργειες" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Θέλετε να το επιτρέψετε;" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9884,4 +10699,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10128,33 +10964,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Ζουμ (σε μέτρα)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10186,6 +11022,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Σφάματα επαλήθευσης" @@ -10195,10 +11031,10 @@ msgstr "Κανένα σφάλμα επαλήθευσης" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Πλέγμα" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10287,23 +11123,15 @@ msgstr "Πραγματοποιεί επαλήθευση δεδομένων" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Δεδομένα με σφάλματα. Αποστολή;" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Άνοιγμα παραθύρου επαλήθευσης." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Ζούμ στο πρόβλημα" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Επαλήθευση" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10374,22 +11202,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10462,23 +11290,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Ελεγκτής ιδιοτήτων:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10489,7 +11317,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10497,78 +11325,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Το κλειδί \"{0}\" δεν είναι έγκυρο." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Ετικέτες χωρίς τιμές" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Έλεγχος τιμών ιδιοτήτων." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10576,82 +11406,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Προσθήκη νέας πηγής στην λίστα." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Επιξεργασία της επιλεγμένης πηγής." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Πηγές δεδομένων" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Έλεγχος τιμών ιδιοτήτων." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Έλεγχος για FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Διόρθωση ιδιοτήτων" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Δεν βρέθηκε ο τύπος του στοιχείου" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10796,7 +11626,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "κτίριο" @@ -10810,5 +11640,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10842,10 +11672,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Κόμβοι ασύνδετοι και χςρίς ετικέτες" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10899,8 +11729,32 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10911,10 +11765,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10963,14 +11817,14 @@ msgstr "Βοήθεια πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Ανορθωμένη Εικόνα..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10981,26 +11835,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Προσαρμοσμένος σύνδεσμος WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Επισκευθείτε την Κεντρική Σελίδα" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11008,5 +11862,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11016,5 +11870,5 @@ msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11023,19 +11877,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Αυτόματη λήψη" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11043,58 +11897,58 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Ανανέωση λανθασμένων πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Κανάλι άλφα" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Προτιμήσεις πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" @@ -11102,31 +11956,31 @@ "πρόσθετου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Όνομα μενού" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Όνομα Μενού (Προκαθορισμένο)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (Προκαθορισμένο)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Αντιγραφή Προξαθορισμένου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11233,11 +12087,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11247,10 +12106,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11258,5 +12117,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11266,5 +12125,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11274,15 +12133,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Εισάγει προβλήματα από OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11290,5 +12149,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11296,5 +12155,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11303,15 +12162,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11320,10 +12179,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Παρέχει δυνατότητες δρομολόγησης." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11332,15 +12191,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11350,10 +12209,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11362,5 +12221,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11369,5 +12228,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11375,11 +12234,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12534,58 +13400,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12599,6 +13413,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Αυτοκινητόδρομος" @@ -12624,6 +13438,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12649,6 +13463,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "πρωτεύων" @@ -12674,6 +13488,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "δευτερεύων" @@ -12687,5 +13501,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12703,5 +13517,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "Οικιστική" @@ -12735,6 +13549,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12761,6 +13575,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12810,5 +13624,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "κυκλικός κόμβος" @@ -13787,5 +14601,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "έλος" @@ -15516,27 +16330,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "άθληση" @@ -18375,7 +19189,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "ποδήλατο" @@ -18445,7 +19259,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18471,5 +19285,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "υπόγειος" @@ -18960,13 +19774,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -19008,5 +19822,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "άλογο" @@ -19226,4 +20040,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Αυτοκινητόδρομος" + #. color tertiary #. @@ -19258,6 +20134,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "οδός" @@ -19313,7 +20189,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19369,8 +20245,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19391,5 +20267,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19403,5 +20279,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19422,5 +20298,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19435,5 +20311,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19448,5 +20324,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "όχθη ποταμού" @@ -19460,5 +20336,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "υδατόρρευμα" @@ -19472,5 +20348,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "προβλήτα" @@ -19498,5 +20374,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "υδαταγωγός" @@ -19664,13 +20540,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19732,7 +20608,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19755,10 +20631,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19794,7 +20670,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19839,6 +20715,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19852,5 +20728,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19872,5 +20748,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19884,5 +20760,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19930,7 +20806,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19947,5 +20823,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "πίστα εύκολη" @@ -19960,5 +20836,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "πίστα μεσαία" @@ -19973,5 +20849,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "πίστα προχορημένη" @@ -19986,5 +20862,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19999,5 +20875,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20012,5 +20888,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "πιστα αρχαρίων" @@ -20115,10 +20991,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20132,5 +21008,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "προβλήτα" @@ -20144,5 +21020,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "αγωγός" @@ -20270,12 +21146,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "αναψυχή" @@ -20289,5 +21165,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20359,8 +21235,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20462,10 +21338,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20851,22 +21727,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20898,6 +21774,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20958,8 +21834,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "υγεία" @@ -21312,26 +22188,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "κατάστημα" @@ -21403,8 +22279,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "ξενοδοχείο" @@ -21554,9 +22430,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "τουρισμός" @@ -21628,8 +22504,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "ιστορικό" @@ -21700,8 +22576,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21715,5 +22591,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "λατομείο" @@ -21727,5 +22603,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "Χ.Υ.Τ.Α." @@ -21747,5 +22623,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "λεκάνη" @@ -21759,5 +22635,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "δάσος" @@ -21771,5 +22647,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21792,5 +22668,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21804,5 +22680,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "βιομηχανική" @@ -21816,5 +22692,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21828,5 +22704,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21840,5 +22716,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21895,7 +22771,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "στρατιωτική" @@ -21909,5 +22785,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "κοιμητήριο" @@ -21920,5 +22796,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "κορυφή" @@ -21933,5 +22809,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "παγετώνας" @@ -21945,5 +22821,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "ηφαίστειο" @@ -21998,8 +22874,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -22013,5 +22889,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -22025,5 +22901,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -22037,5 +22913,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "άλσος" @@ -22049,5 +22925,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "λάσπη" @@ -22061,5 +22937,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "παραλία" @@ -22137,8 +23013,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "διαδρομή" @@ -22186,7 +23062,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "όριο" @@ -22328,10 +23204,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22379,6 +23255,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "διεύθυνση" @@ -22675,109 +23551,45 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Επίπεδο δεδομένων" - -#~ msgid "Uploading data" -#~ msgstr "Αποστολή δεδομένων" - -#~ msgid "Not implemented yet." -#~ msgstr "Δεν έχει υλοποιηθεί ακόμη." - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Επίλυση Διενέξεων" - -#~ msgid "There were conflicts during import." -#~ msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή" - -#~ msgid "Object" -#~ msgstr "Αντικείμενο" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} αντικείμενο έχει διενέξεις:" -#~ msgstr[1] "{0} αντικείμενα έχουν διενέξεις:" - -#~ msgid "my version:" -#~ msgstr "η έκδοση μου:" - -#~ msgid "their version:" -#~ msgstr "η έκδοση τους:" - -#~ msgid "resolved version:" -#~ msgstr "επιλυμένη έκδοση:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Όνομα χρήστη OSM (email)" - -#~ msgid "Unknown host" -#~ msgstr "Άγνωστος υπολογιστής" - -#~ msgid "position" -#~ msgstr "θέση" - -#~ msgid "different" -#~ msgstr "διαφορετικά" - -#~ msgid "true" -#~ msgstr "αληθές" - -#~ msgid "false" -#~ msgstr "ψευδές" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" - -#~ msgid "Change" -#~ msgstr "Αλλαγή" - -#~ msgid "Revert" -#~ msgstr "Επαναφορά" - -#~ msgid "Date" -#~ msgstr "Ημερομηνία" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα." + +#~ msgid "API initialization failed" +#~ msgstr "Αποτυχία αρχικοποίησης API" #~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" #~ msgstr "" -#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση " -#~ "που έχει απιλεγεί στη λίστα ιστορικού." - -#~ msgid "Rotate" -#~ msgstr "Περιστροφή" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)" - -#~ msgid "Error parsing server response." -#~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." - -#~ msgid "Cannot connect to server." -#~ msgstr "Αδυναμία σύνδεσης με το διακομιστή" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." - -#~ msgid "Tagging preset source" -#~ msgstr "Πηγή προεπιλογών ετικετών" - -#~ msgid "Tagging preset sources" -#~ msgstr "Πηγές προεπιλογών ετικετών" +#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα " +#~ "επίπεδο δεδομένων;" + +#~ msgid "Update failed" +#~ msgstr "Αποτυχία ενημέρωσης" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Εφαρμογή μερικών επιλύσεων" + +#~ msgid "Layers: {0}" +#~ msgstr "Επίπεδα: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "" +#~ "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" #~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." #~ msgstr "" -#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή " -#~ "ή ξαναδοκιμάστε αργότερα." - -#~ msgid "Commit comment" -#~ msgstr "Οριστικοποίηση σχολίου" +#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα " +#~ "οποία πήρατε το JOSM για το πρόβλημα." + +#~ msgid "Validate" +#~ msgstr "Επαλήθευση" + +#~ msgid "Server does not support changesets" +#~ msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22788,61 +23600,22 @@ #~ "{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM" -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}" - -#~ msgid "Navigation" -#~ msgstr "Πλοήγηση" - -#~ msgid "image not loaded" -#~ msgstr "η εικόνα δεν φορτώθηκε" - -#~ msgid "Charge" -#~ msgstr "Χρέωση" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών" - #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "" #~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):" -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Το πρόσθετο υπάρχει ήδη" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";" - -#~ msgid "Import TCX File..." -#~ msgstr "Εισαγωγή αρχείου TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS" +#~ msgid "Aborting..." +#~ msgstr "Διακοπή..." + +#~ msgid "Rotate" +#~ msgstr "Περιστροφή" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "unnamed" +#~ msgstr "χωρίς όνομα" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Επικοινωνία με τον διακομιστή OSM..." #~ msgid "" @@ -22850,4 +23623,13 @@ #~ "automatically." #~ msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}" + +#~ msgid "position" +#~ msgstr "θέση" + +#~ msgid "different" +#~ msgstr "διαφορετικά" #~ msgid "" @@ -22864,4 +23646,65 @@ #~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα." +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία" + +#~ msgid "Data Layer" +#~ msgstr "Επίπεδο δεδομένων" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Όνομα χρήστη OSM (email)" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Το πρόσθετο υπάρχει ήδη" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη" + +#~ msgid "Add Selected" +#~ msgstr "Προσθήκη επιλεγμένων" + +#~ msgid "Cannot connect to server." +#~ msgstr "Αδυναμία σύνδεσης με το διακομιστή" + +#~ msgid "Date" +#~ msgstr "Ημερομηνία" + +#~ msgid "Revert" +#~ msgstr "Επαναφορά" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση " +#~ "που έχει απιλεγεί στη λίστα ιστορικού." + +#~ msgid "Object" +#~ msgstr "Αντικείμενο" + +#~ msgid "their version:" +#~ msgstr "η έκδοση τους:" + +#~ msgid "my version:" +#~ msgstr "η έκδοση μου:" + +#~ msgid "Not implemented yet." +#~ msgstr "Δεν έχει υλοποιηθεί ακόμη." + +#~ msgid "Import TCX File..." +#~ msgstr "Εισαγωγή αρχείου TCX..." + +#~ msgid "image not loaded" +#~ msgstr "η εικόνα δεν φορτώθηκε" + +#~ msgid "Navigation" +#~ msgstr "Πλοήγηση" + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -22875,16 +23718,70 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Διενέξεις: {0}" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)" + +#~ msgid "Occupied By" +#~ msgstr "Κατεχόμενο από" + +#~ msgid "Commit comment" +#~ msgstr "Οριστικοποίηση σχολίου" + +#~ msgid "false" +#~ msgstr "ψευδές" + +#~ msgid "true" +#~ msgstr "αληθές" + +#~ msgid "Change" +#~ msgstr "Αλλαγή" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Tagging preset source" +#~ msgstr "Πηγή προεπιλογών ετικετών" + +#~ msgid "Tagging preset sources" +#~ msgstr "Πηγές προεπιλογών ετικετών" + +#~ msgid "Error parsing server response." +#~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή." + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Charge" +#~ msgstr "Χρέωση" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." #~ msgstr "" -#~ "Άνοιγμα του παραθύρου OpenStreetBugs και ενεργοποίηση αυτόματης λήψης" - -#~ msgid "Delete and Download" -#~ msgstr "Διαγραφή και Λήψη" - -#~ msgid "Solve Conflict" -#~ msgstr "Επίλυση Διένεξης" +#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή " +#~ "ή ξαναδοκιμάστε αργότερα." + +#~ msgid "There were conflicts during import." +#~ msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι." + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:" #~ msgid "" @@ -22895,6 +23792,45 @@ #~ "συνεχίσετε;" -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα" + +#~ msgid "resolved version:" +#~ msgstr "επιλυμένη έκδοση:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} αντικείμενο έχει διενέξεις:" +#~ msgstr[1] "{0} αντικείμενα έχουν διενέξεις:" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Επίλυση Διενέξεων" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Διενέξεις: {0}" + +#~ msgid "Move Down" +#~ msgstr "Μετακίνηση Κάτω" + +#~ msgid "Basic" +#~ msgstr "Βασικό" + +#~ msgid "Remove Selected" +#~ msgstr "Αφαίρεση Επιλεγμένων" + +#~ msgid "Move Up" +#~ msgstr "Μετακίνηση Πάνω" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Επεξεργαστής Σχέσεων: {0}" + +#~ msgid "Delete and Download" +#~ msgstr "Διαγραφή και Λήψη" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "" +#~ "Άνοιγμα του παραθύρου OpenStreetBugs και ενεργοποίηση αυτόματης λήψης" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS" #~ msgid "Helppage missing. Create it in english." @@ -22910,16 +23846,16 @@ #~ "A> ή στη γλώσσα σας." +#~ msgid "Error when communicating with server." +#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." + +#~ msgid "image loading..." +#~ msgstr "φόρτωση εικόνας..." + +#~ msgid "% of lat:" +#~ msgstr "% γεωγ. πλάτους:" + +#~ msgid "% of lon:" +#~ msgstr "% γεωγ. μήκους:" + #~ msgid "Overlap tiles" #~ msgstr "Επικάλυψη πλακιδίων" - -#~ msgid "% of lat:" -#~ msgstr "% γεωγ. πλάτους:" - -#~ msgid "% of lon:" -#~ msgstr "% γεωγ. μήκους:" - -#~ msgid "Error when communicating with server." -#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." - -#~ msgid "image loading..." -#~ msgstr "φόρτωση εικόνας..." Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 16826) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 16827) @@ -10,7 +10,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-09 11:05+0000\n" -"Last-Translator: Brian Burns \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-27 19:58+0000\n" +"Last-Translator: Michael Keppler \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" @@ -18,81 +18,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Creating main GUI" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Unsaved Changes" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "There are unsaved changes. Discard the changes and continue?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Save and Exit" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Discard and Exit" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -101,32 +181,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Cancel" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Warning" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "UNKNOWN" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "About" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Display the about screen." @@ -134,10 +274,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -145,5 +285,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -152,19 +292,19 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Last change at {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Homepage" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Bug Reports" @@ -174,37 +314,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Readme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revision" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Contribution" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "About JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "File could not be found." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -215,16 +359,9 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Please select at least one already uploaded node, way, or relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Warning" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -235,7 +372,35 @@ "primitives only" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Please select the row to delete." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Select either:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Merge Nodes" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Add Node..." @@ -247,14 +412,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -262,57 +429,57 @@ msgstr "Edit: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Enter the coordinates for the new node." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Use decimal degrees." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative values denote Western/Southern hemisphere." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitude" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Align Nodes in Circle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Move the selected nodes into a circle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -328,25 +495,58 @@ msgstr "Tool: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Please select at least four nodes." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Align Nodes in Line" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Move the selected nodes in to a line." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Please select at least three nodes." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -357,18 +557,10 @@ "{0}, max is {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "API Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Failed to initialise API. Please try again later." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "API initialisation failed" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -379,5 +571,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -388,46 +580,46 @@ "length {2}. Values length is {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Precondition Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zoom to {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom the view to {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -437,30 +629,30 @@ msgstr "View: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Nothing selected to zoom to." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Combine ways with different memberships?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -470,13 +662,13 @@ "combine them?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Combine Anyway" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Change directions?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -486,10 +678,10 @@ "reverse some of them?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Reverse and Combine" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -497,20 +689,20 @@ msgstr "Enter values for all conflicts." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Solve Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "All the ways were empty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -529,111 +721,149 @@ msgstr "Copy selected objects to paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Please select something to copy." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Create Circle" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Create a circle from three selected nodes." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Those nodes are not in a circle." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Please select exactly two or three nodes or one way with exactly two or " +"three nodes." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Delete" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Delete selected objects." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Overwrite" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribute Nodes" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Download map data from the OSM server." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Download" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Please select at least one task to download" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "There were {0} conflicts during import." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Errors during Download" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplicate" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicate selection by copy and immediate paste." @@ -653,5 +883,5 @@ msgstr "Exit the application." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -661,58 +891,73 @@ "tracks." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Export to GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Export the data to GPX file." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nothing to export. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "parameter ''{0}'' must not be null" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "gps track description" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Add author information" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Real name" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefined" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright year" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Keywords" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Export options" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Export and Save" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -723,25 +968,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Error" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Choose a predefined licence" @@ -751,46 +976,49 @@ msgstr "JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Open in Browser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Edit" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Reload" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Can only edit help pages from JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Error while loading page {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Help page missing. Create it in English." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -828,30 +1056,40 @@ msgstr "Join a node into the nearest way segments" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Join Node and Line" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "No Shortcut" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Merge Anyway" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Merge the layer directly below into the selected 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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -861,68 +1099,79 @@ "to merge them?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Merge Anyway" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Merge {0} nodes" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selection" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Updates the currently selected primitives from the server" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Mirror" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Mirror selected nodes and ways." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Please select at least one node or way." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "up" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Move objects {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "down" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "left" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "right" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Move {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Moves Objects {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Cannot move objects outside of the world." @@ -930,5 +1179,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "New" @@ -938,26 +1187,17 @@ msgstr "Create a new map." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "unnamed" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Open..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Open a file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Could not read \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -986,34 +1226,35 @@ msgstr "Download URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Orthogonalise Shape" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Move nodes so all angles are 90 or 270 degree" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Only two nodes allowed" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Selection must consist only of ways." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Please select one or more closed ways of at least four nodes." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Please select ways with almost right angles to orthogonalise." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "You are using the EPSG:4326 projection which might lead
to " @@ -1021,9 +1262,9 @@ "projection to get rid of this warning.
Do you want to continue?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Only one node selected" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Orthogonalise" @@ -1039,11 +1280,11 @@ msgstr "Paste contents of paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Paste Tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Apply tags of contents of paste buffer to all selected items." @@ -1071,16 +1312,21 @@ msgstr "Redo the last undone action." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Rename layer" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Also rename the file" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Could not rename the file \"{0}\"." @@ -1094,9 +1340,9 @@ msgstr "Reverse the direction of all selected ways." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Please select at least one way." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Reverse ways" @@ -1104,17 +1350,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Save" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Save the current data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "File {0} exists. Overwrite?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1124,25 +1372,25 @@ "a bug." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "No document open so nothing to save." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Empty document" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "The document contains no data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Save anyway" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1152,54 +1400,77 @@ "if you rejected all. Continue?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Reject Conflicts and Save" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Save OSM file" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Save GPX file" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Save Layer" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Could not back up file." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Unknown file extension: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"An error occurred while communicating with the server
Details: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "An error occurred while restoring backup file." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Unknown file extension." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "An error occurred while saving." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "An error occurred while restoring backup file." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Save As..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Save the current data to a new file." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Select All" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1233,16 +1504,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Close" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Split Way" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Split a way at the selected node." @@ -1252,5 +1523,5 @@ msgstr "The current selection cannot be used for splitting." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1258,5 +1529,5 @@ msgstr[1] "The selected nodes are not in the middle of any way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1272,9 +1543,9 @@ "way also." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "The selected nodes do not share the same way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1282,10 +1553,10 @@ msgstr[1] "The selected way does not contain all the selected nodes." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "You must select two or more nodes to split a circular way." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1295,21 +1566,23 @@ "middle of the way.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." +msgstr "" "A role based relation membership was copied to all new ways.\n" "You should verify this and correct it when necessary." -msgstr "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" "A relation membership was copied to all new ways.\n" "You should verify this and correct it when necessary." -msgstr "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1330,46 +1603,46 @@ 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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Select either:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* One tagged node, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* One node that is used by more than one way, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* One node that is used by more than one way and one of those ways, or" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1377,5 +1650,5 @@ "* 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1383,5 +1656,5 @@ "* 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:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1395,9 +1668,9 @@ "own copy and all nodes will be selected." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Unglued Node" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1405,5 +1678,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1419,140 +1692,91 @@ msgstr "Undo the last action." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Unselect All" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Unselect all objects." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Unselect All (Focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Unselect All (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Update Data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Updates the current data layer from the server (re-downloads data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"No data to update found. Have you already opened or downloaded a data layer?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Failed to update the selected primitives." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Update failed" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "No GPX data layer found." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Could not find primitive with id {0} in the current dataset" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Missing primitive" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Update Selection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Updates the currently selected primitives from the server" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "There are no selected primitives to update." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selection empty" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Upload to OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Upload all changes to the OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objects to add:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objects to modify:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objects to delete:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Upload these changes?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Upload Changes" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "There are unresolved conflicts. You have to resolve these first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "No changes to upload." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Uploading" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Updating primitive" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchronize {0} {1} only" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synchronize entire dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1573,17 +1797,17 @@ "{6} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Conflict detected" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "unexpected return value. Got {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1598,62 +1822,65 @@ "{1} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Precondition violation" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

The error message is:" +"
{0}" +msgstr "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Primitive already deleted" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, fuzzy, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Message of the day not available" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- running version is {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Downloading \"Message of the day\"" @@ -3068,62 +3474,57 @@ msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, 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/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Open file (as raw gps, if .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Download the bounding box as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Launch in maximised mode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Set the language." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "examples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3133,51 +3534,51 @@ "some data before --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Instead of --download= you may specify osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Activating updated plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Loading early plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Loading plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3185,21 +3586,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Wireframe View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Toggle Wireframe view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Full Screen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Toggle Full Screen view" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3243,53 +3644,68 @@ msgstr "scale" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "The geographic longitude at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "The name of the object at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "The geographic latitude at the mouse pointer." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "The angle between the previous and the current way segment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "The (compass) heading of the line segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "The length of the new way segment being drawn." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(no object)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "layer not in list." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contacting the OSM server..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Error while parsing" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3312,4 +3728,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initialising" @@ -3341,20 +3758,20 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Properties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3362,30 +3779,30 @@ msgstr "Nodes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3393,17 +3810,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3413,25 +3830,25 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Conflict Resolution" @@ -3468,5 +3885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "My version" @@ -3477,5 +3894,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3491,5 +3908,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Their version" @@ -3573,7 +3990,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3650,14 +4066,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "parameter '{0}' must not be null" @@ -3688,10 +4104,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "unexpected column index. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3702,19 +4118,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Communication with server failed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Yes, undelete them too" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "No, cancel operation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3725,9 +4141,9 @@ "the server.

Do you want to undelete these nodes too?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Undelete additional nodes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3740,13 +4156,13 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Undelete dependent primitives?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Properties in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3756,90 +4172,90 @@ "elements when merge decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Properties in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Coordinates:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Deleted State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Visible State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(none)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "not deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "not visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Keep a clone of the local version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Physically delete from local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Keep my coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Keep their coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Undecide conflict between different coordinates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Keep my deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Keep their deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Undecide conflict between deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Keep my visible state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Yes, reset the id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "No, abort" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3852,5 +4268,5 @@ "agree?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Reset id to 0" @@ -3877,12 +4293,11 @@ msgstr "Remove from dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Undecide conflict between visible state" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3927,10 +4342,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3939,10 +4354,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3951,5 +4366,5 @@ msgstr "Value" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "cannot apply undecided tag merge item" @@ -4009,9 +4424,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4019,5 +4434,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4047,6 +4462,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4054,40 +4469,57 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Resolve conflicts" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Cancel conflict resolution and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Apply partial resolutions" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Continue anyway" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." +msgstr "" "You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " "remaining conflicts later.
Click {1} to return to " "resolving conflicts." -msgstr "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." + +#: ../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 "Resolve conflicts" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Resolve version conflicts for {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4105,96 +4537,130 @@ msgstr "Failed to load history from the server. Details:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, 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:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "History item" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Show" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Display the history of the selected primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Layers" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Delete the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "There are unsaved changes. Delete the layer anwyay?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Delete Layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Do you really want to delete the whole layer?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Information" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "yes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Delete" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Delete {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Show/Hide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Toggle visible state of the selected layer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Show/Hide Text/Icons" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Toggle visible state of the marker text and icons." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Layers" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "private" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Delete the selected layer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Merge the layer directly below into the selected layer." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Move the selected layer one row down." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Merge the layer directly below into the selected layer." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Layers: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Information Board" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4203,22 +4669,28 @@ msgstr[1] "This will change up to {0} objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "An empty value deletes the key." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Change values?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4227,84 +4699,89 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Please select a key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Please select a value" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Please select the objects you want to change properties for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Properties/Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Properties for selected objects." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Change relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Really delete selection from relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Add" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Edit Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Delete Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Delete the selected key in all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Properties: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Properties / Memberships" @@ -4313,63 +4790,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Open a list of all relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relations: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Delete the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Create a new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relations: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Delete the selected relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Current Selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Open a selection list window." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zoom to selected element(s)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Refresh the selection list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoom to selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4378,5 +4857,5 @@ msgstr[1] "{0} ways" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4385,5 +4864,5 @@ msgstr[1] "{0} relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4394,5 +4873,10 @@ msgstr "Undock the panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4400,144 +4884,415 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Click to minimise/maximise the panel content" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Authors" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Open a list of people working on the selected objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Author" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Authors: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Download relation members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Download Area" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Delete the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Download visible tiles" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Conflicts in data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "No relation is selected" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Downloading Plugin {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "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 "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Removed Element from Relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Failed to update the selected primitives." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Move the currently selected members up" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Move the currently selected members down" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Remove all currently selected objects from relation" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Delete the selected relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Continue resolving" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Conflicts in data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Save the current data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Download all incomplete ways and nodes in relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Download Members" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Yes, purge it" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Confirm Remote Control action" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zoom Out" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Move the currently selected members down" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Apply Changes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Basic" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Occupied By" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "linked" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Move Up" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Move the currently selected members up" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Add Selected" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Add all currently selected objects as members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Remove Selected" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Remove all currently selected objects from relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Move Down" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Move the currently selected members down" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Remove the member in the current table row from this relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Download Members" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relation Editor: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "There were {0} conflicts during import." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Create new relation in layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Edit new relation in layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "Edit relation #{0} in layer ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Load Selection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +#, fuzzy +msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4546,5 +5301,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4554,25 +5309,22 @@ msgstr[1] "Remove old keys from up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Updating properties of up to {0} object" -msgstr[1] "Updating properties of up to {0} objects" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bookmarks" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Please enter the desired coordinates first." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Please enter a name for the location." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Change location" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Select a bookmark first." @@ -4607,34 +5359,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Data Sources and Types" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Download as new layer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Download Area" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Download area too large, will probably be rejected by server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Download area ok, size probably acceptable to server" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer exception, possibly some missing tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Please enter a search string" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Cannot read place search results from server" @@ -4642,5 +5394,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Enter a place name to search for:" @@ -4648,5 +5400,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4654,6 +5406,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "name" @@ -4692,6 +5444,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4714,15 +5466,15 @@ msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "near" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4730,6 +5482,9 @@ "Click." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +"Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " +"Hold right mousebutton and move mouse or use cursor keys. Select: " +"Click." + +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Slippy map" @@ -4761,5 +5516,11 @@ msgstr "History for {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Close the dialogue" @@ -5502,5 +6263,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5669,59 +6430,59 @@ msgstr "Version" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Images for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Read GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "No time for point {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Cannot read time \"{0}\" from point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "No images with readable timestamps found." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Reading {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotagged Images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS end: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "current delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "timezone difference: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5729,138 +6490,128 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} within the track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sync clock" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG images (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "The date in file \"{0}\" could not be parsed." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "There is no EXIF time within the file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS unit timezone (difference to photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synchronise Time with GPS Unit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Time entered could not be parsed." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps point" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Customise line drawing" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Use global settings." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Draw lines between points for this layer." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Do not draw lines between points for this layer." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Select line drawing options" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Customise Colour" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Default" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Choose a colour" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Markers From Named Points" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Named Trackpoints from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Import Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave Audio files (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Audio markers from {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Import images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5869,5 +6620,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5876,5 +6627,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5883,30 +6634,30 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Name: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Length: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Convert to data layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5916,43 +6667,43 @@ "
If you want to upload traces, look here:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Converted from: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Download everything within:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maximum area per request:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} sq km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5963,9 +6714,9 @@ "wish
to continue?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "No GPX track available in layer to associate audio with." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5975,5 +6726,5 @@ "the end were omitted or moved to the start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5983,47 +6734,47 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} deleted.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6048,5 +6799,5 @@ msgstr[1] "tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6054,5 +6805,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6061,5 +6812,5 @@ msgstr[1] "a track with {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6068,5 +6819,5 @@ msgstr[1] "{0} consists of {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6085,5 +6836,5 @@ msgstr[1] "markers" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6092,9 +6843,9 @@ msgstr[1] "{0} consists of {1} markers" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synchronise Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6102,20 +6853,20 @@ "You need to pause audio at the moment when you hear your synchronisation cue." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Audio synchronised at point {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Unable to synchronise in layer being played." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Make Audio Marker at Play Head" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6125,10 +6876,17 @@ "marker." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "No existing audio markers in this layer to offset from." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Show/Hide Text/Icons" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Toggle visible state of the marker text and icons." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6138,5 +6896,5 @@ "track you were playing (after the first marker)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6146,29 +6904,29 @@ "point where you want to synchronise." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Unable to create new audio marker." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "There was an error while trying to display the URL for this marker" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL was: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Error displaying URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Advanced Preferences" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Setting Preference entries directly. Use with caution!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6176,26 +6934,26 @@ msgstr "Search: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Current value is default." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Default value is ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Default value currently unknown (setting has not been used yet)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Please select the row to edit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6203,14 +6961,14 @@ msgstr "New value for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Please select the row to delete." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Enter a new key/value pair" @@ -6347,40 +7105,40 @@ msgstr "Voice recorder calibration" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Colour" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Paint style {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Layer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Choose" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Choose a colour for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Set to default" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Set all to default" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Colours used by different objects in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Colours" @@ -6708,57 +7466,66 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34 msgid "Enable built-in icon defaults" -msgstr "" +msgstr "Enable built-in icon defaults" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 msgid "Map Paint Styles" -msgstr "" +msgstr "Map Paint Styles" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "Used style" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configure available plugins." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Download List" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configure Sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Add JOSM Plugin description URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Please select an entry." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Edit JOSM Plugin description URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Add JOSM Plugin description URL." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Configure Plugin Sites" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Display Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6768,29 +7535,29 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Connection Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Connection Settings for the OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Map Settings" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Settings for the map projection and data interpretation." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Audio 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 audio player and audio markers." msgstr "Settings for the audio player and audio markers." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "You have to restart JOSM for some settings to take effect." @@ -6895,61 +7662,63 @@ msgstr "Shortcut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +msgstr "Short Description: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +msgstr "URL: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +msgstr "Author: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +msgstr "Webpage: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgstr "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 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Icon paths" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +msgstr "Copy defaults" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Please select the row to copy." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +msgstr "The XML source (URL or filename) for {0} definition files." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "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 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:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" -msgstr "" +msgstr "Defaults (See tooltip for detailed information)" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38 @@ -7138,33 +7907,33 @@ msgstr "Modifier Groups" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "More information about this feature" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Use preset ''{0}'' of group ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Use preset ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "closed way" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7175,15 +7944,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7193,18 +7962,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Change Properties" @@ -7215,33 +7984,36 @@ msgstr "Preset group ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Contacting OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Downloading points {0} to {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Downloading OSM data..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, possibly some missing tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Preparing data..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Could not read \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7249,21 +8021,21 @@ msgstr "GPX Files" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markers from {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "File \"{0}\" does not exist" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7279,10 +8051,29 @@ msgstr "no primitive with id {0} in local dataset. Can't infer primitive type" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Downloading 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 #, 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:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7292,48 +8083,47 @@ "for each primitive" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 Files" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordinates imported: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Malformed sentences: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Checksum errors: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Unknown sentences: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Zero coordinates: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA import success" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA import failure!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "preference ''{0}'' missing. Can't initialize OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7344,15 +8134,15 @@ "{0} to {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Communications with {0} established using protocol version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7361,34 +8151,47 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Opening changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Uploading..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Scanning directory {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Code={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "The server replied an error with code {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7421,9 +8224,4 @@ msgstr "Login" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Aborting..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7479,66 +8277,70 @@ "''{1}''" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Error during parse." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM Server Files" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Unknown version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Version number missing from OSM data" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Unknown version: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Found element in non-way." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " has zero ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Found element in non-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Missing attribute \"ref\" on member in relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Missing attribute \"type\" on member {0} in relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Incomplete specification with ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Illegal object with id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7547,46 +8349,66 @@ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Missing attribute \"version\" on OSM primitive with id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Missing required attribute \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Prepare OSM data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Ill-formed node id" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Downloading history..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Contacting Server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Failed to open connection to API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7594,5 +8416,18 @@ "Couldn't connect to the osm server. Please check your internet connection." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7600,17 +8435,14 @@ "use changesets, but API is not able to handle them. Ignoring changesets." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +"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:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Update Plugins" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Download Plugins" @@ -7627,5 +8459,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7634,23 +8466,23 @@ msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Downloading Plugin {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Skip download" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM version {0} required for plugin {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Download Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Skip Download" @@ -7661,34 +8493,32 @@ msgstr "An error occurred in plugin {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." +msgstr "" "Warning - loading of {0} plugin was requested. This plugin is no longer " "required." -msgstr "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Plugin {0} requires JOSM update to version {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Plugin {0} is required by plugin {1} but was not found." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin not found: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Last plugin update more than {0} days ago." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7698,21 +8528,21 @@ "setting the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Disable plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Could not load plugin {0}. Delete from preferences?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Keep plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7722,5 +8552,5 @@ "overwrite the existing ones." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7729,10 +8559,10 @@ "An unexpected exception occurred that may have come from the ''{0}'' plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "According to the information within the plugin, the author is {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7740,9 +8570,9 @@ "Try updating to the newest version of this plugin before reporting a bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Should the plugin be disabled?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7752,27 +8582,23 @@ "unload the plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Information" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "No plugin information found." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "no description available" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "More details" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7781,13 +8607,18 @@ msgstr[1] "Downloaded plugin information from {0} sites" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "No plugin information found." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "All installed plugins are up to date." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7800,9 +8631,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Download missing plugins" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7815,57 +8646,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "unknown" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin bundled with JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Error reading plugin information file: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "This is after the end of the recording" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Error playing sound" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Do nothing" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Report Bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7879,18 +8688,18 @@ "version of JOSM, please consider being kind and file a bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Unexpected Exception" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Please report a ticket at {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Include your steps to get to the error (as detailed as possible)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7900,17 +8709,33 @@ "a bug." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Be sure to include the following information:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(The text has already been copied to your clipboard.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Do not show again" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7923,5 +8748,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7931,5 +8756,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7940,13 +8765,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Hint: You can edit the shortcuts in the preferences.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Create grid of ways" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7956,21 +8796,21 @@ "in common" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Select two ways with a node in common" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Select two ways with alone a node in common" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Create a grid of ways" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Upload Trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7978,74 +8818,75 @@ msgstr "Upload Traces" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Public" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Selected makes your trace public in openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Please enter Description about your trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Please enter tags about your trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Selected track: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Connecting..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Upload cancelled" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Error while uploading" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX upload was successful" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Upload failed. Server returned the following message: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Uploading GPX track: {0}% ({1} of {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "No description provided. Please provide some description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "No GPX layer selected. Cannot upload a trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "No username provided." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "No password provided." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Uploading GPX Track" @@ -8115,33 +8956,34 @@ msgstr "One of the selected files was null !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Read photos..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Unable to get canonical path for directory {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Scanning directory {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Found null file in directory {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Error while getting files from directory {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Correlate to GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8161,15 +9003,15 @@ msgstr "GPX Files (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "File {0} is loaded yet under the name \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Error while parsing {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8181,34 +9023,34 @@ "on the photo and select a timezone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Photo time (from exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps time (read from the above photo): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "I'm in the timezone of: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "No date" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Open an other photo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronise time from a photo of the GPS receiver" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8218,70 +9060,70 @@ "Please use the requested format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Invalid date" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX track: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Open another GPX trace" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Timezone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Offset:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "I can take a picture of my GPS receiver.
Can this help?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Update position for: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "All images" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Images with no exif position" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Not yet tagged images" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Correlate images with GPX track" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Correlate" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Auto-Guess" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "You should select a GPX track" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "No selected GPX track" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8292,9 +9134,9 @@ "Expected format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Invalid timezone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8305,26 +9147,26 @@ "Expected format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Invalid offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Found {0} matches of {1} in GPX track {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX Track loaded" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "The selected photos don't contain time information." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Photos don't contain time information" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8332,39 +9174,39 @@ "The selected GPX track doesn't contain timestamps. Please select another one." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX Track has no time information" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Timezone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minutes: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Seconds: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Matched {0} of {1} photos to GPX track." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Time difference of {0} days)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Offset between track and photos: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8374,13 +9216,13 @@ "adjust the sliders to manually match the photos." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Matching photos to track failed" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Adjust timezone and offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Default Values" @@ -8402,5 +9244,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Error loading file" @@ -8423,6 +9265,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Illegal url." @@ -8603,22 +9445,22 @@ msgstr "Add \"source=...\" to elements?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Downloading {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Contacting WMS Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Create buildings" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8628,18 +9470,18 @@ "building import size is limited to 1 km2 max." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Please, enable auto-sourcing and check cadastre millesime." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Extract SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Extract best fitting boundary..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Create boundary" @@ -8756,6 +9598,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Blank Layer" @@ -8784,5 +9626,5 @@ msgstr "Commune bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8793,14 +9635,14 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Cache Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Cache Lambert Zone Error" @@ -8876,5 +9718,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "TCX Files (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8891,4 +9733,9 @@ msgstr "Can't duplicate unordered way." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "No data loaded." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8899,9 +9746,9 @@ msgstr "Create duplicate way" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Layer for editing GPX tracks" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Convert to GPX layer with anonymised time" @@ -9022,30 +9869,30 @@ msgstr "delete data after import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importing data from device." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importing data from DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Error deleting data." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "imported data from {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "No data found on device." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Connection failed." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9057,14 +9904,14 @@ "plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat Import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Import Data from Globalsat Datalogger DG100 into GPX layer." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Import" @@ -9155,40 +10002,40 @@ msgstr "Open images with ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Direction index '{0}' not found" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "The starting location was not within the bbox" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Looking for shoreline..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} nodes so far..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Error creating cache directory: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Tracing" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "checking cache..." @@ -9197,26 +10044,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Running vertex reduction..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Running Douglas-Peucker approximation..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Removing duplicate nodes..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker trace" @@ -9301,7 +10140,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "water" @@ -9453,9 +10292,9 @@ msgstr "Lakewalker Plugin Preferences" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Downloading image tile..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Could not acquire image" @@ -9704,18 +10543,18 @@ msgstr "Unknown issue state" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Open Visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Open only files that are visible in current view." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "No view open - cannot determine boundaries!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9742,33 +10581,33 @@ msgstr "Firefox executable" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "load data from API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "change the selection" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "change the viewport" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "confirm all Remote Control actions manually" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "A plugin that allows JOSM to be controlled from other applications." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Settings for the Remote Control plugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9780,28 +10619,28 @@ "talking to the plugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Permitted actions" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Remote Control has been asked to load data from the API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Request details: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Do you want to allow this?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Confirm Remote Control action" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Remote Control has been asked to import data from the following URL:" @@ -9810,13 +10649,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Edit relation" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Edit relations" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "No relation is selected" #. Add menu @@ -9930,5 +10769,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "image " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9975,5 +10814,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "error requesting update: not zoom-level 12" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -10064,4 +10903,25 @@ msgid "Highlight" msgstr "Highlight" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Updating properties of up to {0} object" +msgstr[1] "Updating properties of up to {0} objects" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10315,33 +11175,33 @@ msgstr "Opens a dialog that allows to jump to a specific location" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Enter Lat/Lon to jump to position." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "You can also paste an URL from www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (in metres)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Jump there" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Jump to Position" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Could not parse Latitude, Longitude or Zoom. Please check." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Unable to parse Lon/Lat" @@ -10375,6 +11235,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Validation errors" @@ -10384,10 +11244,10 @@ msgstr "No validation errors" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Grid" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10478,23 +11338,15 @@ msgstr "Performs the data validation" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Data with errors. Upload anyway?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Open the validation window." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoom to problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Validate" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Validate either current selection or complete dataset." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10567,22 +11419,22 @@ msgstr "Crossing ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Duplicated nodes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "This test checks that there are no nodes at the very same location." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Duplicated way nodes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Checks for ways with identical consecutive nodes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Duplicated way nodes" @@ -10659,23 +11511,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:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Properties checker :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "This plugin checks for errors in property keys and values." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Invalid tagchecker line - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Invalid spellcheck line: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10686,7 +11538,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Illegal tag/value combinations" @@ -10694,78 +11546,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Painting problem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Key ''{0}'' invalid." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Tags with empty values" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Invalid property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Invalid white space in property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Property values start or end with white space" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Property values contain HTML entity" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Key ''{0}'' not in presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Presets do not contain property key" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Value ''{0}'' for key ''{1}'' not in presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Presets do not contain property value" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Check property keys." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Validate that property keys are valid checking against list of words." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Use complex property checker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Validate property values and tags using complex rules." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "TagChecker source" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10775,82 +11629,82 @@ "org/index.php/User:JLS/speller) or tag checking data files." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Add a new source to the list." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Edit the selected source." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Data sources" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Check property values." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Validate that property values are valid checking against presets." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Check for FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Looks for nodes or ways with FIXME in any property value." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Check for paint notes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Check if map painting found data errors." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Use default data file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Use the default data file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +msgstr "Use default tag ignore file." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +msgstr "Use the default tag ignore file (recommended)." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Use default spellcheck file." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Use the default spellcheck file (recommended)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Fix properties" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Could not find element type" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Could not find warning level" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Illegal expression ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10995,7 +11849,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "building" @@ -11009,5 +11863,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "area" @@ -11041,10 +11895,10 @@ msgstr "Connected way end node near other way" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Untagged and unconnected nodes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "This test checks for untagged nodes that are not part of any way." @@ -11064,5 +11918,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Unnamed junction" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -11098,8 +11952,32 @@ msgstr "Reversed land: land not on left side" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11110,10 +11988,10 @@ msgstr "Select a starting node on the end of a way" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Reached the end of the line" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Reached a junction" @@ -11184,14 +12062,14 @@ msgstr "WMS Plugin Help" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Rectified Image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Download Rectified Images From Various Services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11202,26 +12080,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Custom WMS Link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Supported Rectifier Services:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Visit Homepage" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS URL or Image ID:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Add Rectified Image" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11231,5 +12109,5 @@ "again." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "No valid WMS URL or id" @@ -11239,5 +12117,5 @@ msgstr "Adjust the position of the selected WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11248,19 +12126,19 @@ "This may lead to wrong coordinates." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatic downloading" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS layer ({0}), automatically downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS layer ({0}), downloading in zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11268,90 +12146,90 @@ "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:231 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Open a blank WMS layer to load data from a file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "WMS Plugin Preferences" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Modify list of WMS servers displayed in the WMS plugin menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menu Name" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Menu Name (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (Default)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Enter a menu name and WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copy Default" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" -msgstr "" +msgstr "Downloader:" #. * @@ -11470,11 +12348,16 @@ msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Provide a background layer that displays a map grid" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11487,10 +12370,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Helps vectorising WMS images." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11499,5 +12382,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11510,5 +12393,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11521,15 +12404,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Displays an OpenLayers background image" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11538,5 +12421,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11545,5 +12428,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11554,27 +12437,29 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Let other applications send commands to JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " "defined in routes.xml file in plugin directory" msgstr "" +"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " +"defined in routes.xml file in plugin directory" #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11585,15 +12470,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialog for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11606,10 +12491,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11620,5 +12505,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11629,5 +12514,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11637,11 +12522,18 @@ "for the common ones. Spellcheck integrated for tag names." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12797,58 +13689,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12862,6 +13702,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorway" @@ -12887,6 +13727,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "trunk" @@ -12912,6 +13752,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "primary" @@ -12937,6 +13777,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "secondary" @@ -12950,5 +13790,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "tertiary" @@ -12966,5 +13806,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "residential" @@ -12998,6 +13838,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "service" @@ -13024,6 +13864,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "construction" @@ -13073,5 +13913,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "roundabout" @@ -14050,5 +14890,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "marsh" @@ -15779,27 +16619,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18638,7 +19478,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bicycle" @@ -18708,7 +19548,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "foot" @@ -18734,5 +19574,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "subway" @@ -19223,13 +20063,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "deprecated" @@ -19271,5 +20111,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "horse" @@ -19489,4 +20329,66 @@ msgstr "barrier" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Motorroad" + #. color tertiary #. @@ -19521,6 +20423,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "street" @@ -19576,7 +20478,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "highway_track" @@ -19632,8 +20534,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "rail" @@ -19654,5 +20556,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "services" @@ -19666,5 +20568,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "ford" @@ -19685,5 +20587,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "turningcircle" @@ -19698,5 +20600,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "emergency_access_point" @@ -19711,5 +20613,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "riverbank" @@ -19723,5 +20625,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "stream" @@ -19735,5 +20637,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "dock" @@ -19761,5 +20663,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "aqueduct" @@ -19927,13 +20829,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "manmade" @@ -19995,7 +20897,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "railwaypoint" @@ -20018,10 +20920,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "otherrail" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "railover" @@ -20057,7 +20959,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "oldrail" @@ -20102,6 +21004,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "aeroway" @@ -20115,5 +21017,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20135,5 +21037,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -20147,5 +21049,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "aeroway_light" @@ -20193,7 +21095,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "aerialway" @@ -20210,5 +21112,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "piste_easy" @@ -20223,5 +21125,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "piste_intermediate" @@ -20236,5 +21138,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "piste_advanced" @@ -20249,5 +21151,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "piste_expert" @@ -20262,5 +21164,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "piste_freeride" @@ -20275,5 +21177,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "piste_novice" @@ -20378,10 +21280,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "power" @@ -20395,5 +21297,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "pier" @@ -20407,5 +21309,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "pipeline" @@ -20533,12 +21435,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "leisure" @@ -20552,5 +21454,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20622,8 +21524,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "amenity" @@ -20725,10 +21627,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "amenity_traffic" @@ -21114,22 +22016,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "amenity_light" @@ -21161,6 +22063,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "light_water" @@ -21221,8 +22123,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "health" @@ -21575,26 +22477,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "shop" @@ -21666,8 +22568,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21817,9 +22719,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "tourism" @@ -21891,8 +22793,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historic" @@ -21963,8 +22865,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "green" @@ -21978,5 +22880,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "quarry" @@ -21990,5 +22892,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "landfill" @@ -22010,5 +22912,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "basin" @@ -22022,5 +22924,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "forest" @@ -22034,5 +22936,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "farmyard" @@ -22055,5 +22957,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "retail" @@ -22067,5 +22969,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industrial" @@ -22079,5 +22981,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "brownfield" @@ -22091,5 +22993,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "greenfield" @@ -22103,5 +23005,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "railland" @@ -22158,7 +23060,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "military" @@ -22172,5 +23074,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cemetery" @@ -22183,5 +23085,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "peak" @@ -22196,5 +23098,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "glacier" @@ -22208,5 +23110,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "volcano" @@ -22261,8 +23163,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "natural" @@ -22276,5 +23178,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "scrub" @@ -22288,5 +23190,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "heath" @@ -22300,5 +23202,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "wood" @@ -22312,5 +23214,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "mud" @@ -22324,5 +23226,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "beach" @@ -22400,8 +23302,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "route" @@ -22449,7 +23351,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "boundary" @@ -22591,10 +23493,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "place" @@ -22642,6 +23544,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "address" @@ -22791,5 +23693,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Unnamed unclassified highway" #. way : W : highway == unclassified && name != * @@ -22902,20 +23804,20 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -22938,24 +23840,98 @@ msgstr "Terraserver Urban" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Failed to initialise API. Please try again later." + +#~ msgid "API initialization failed" +#~ msgstr "API initialisation failed" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" + +#~ msgid "No data" +#~ msgstr "No data" + +#~ msgid "Update failed" +#~ msgstr "Update failed" + +#~ msgid "Missing primitive" +#~ msgstr "Missing primitive" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Apply partial resolutions" + +#~ msgid "Layers: {0}" +#~ msgstr "Layers: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Remove the member in the current table row from this relation" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." + +#~ msgid "Validate" +#~ msgstr "Validate" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Validate either current selection or complete dataset." + #~ msgid "Data Layer" #~ msgstr "Data Layer" -#~ msgid "Uploading data" -#~ msgstr "Uploading data" - #~ msgid "Not implemented yet." #~ msgstr "Not implemented yet." -#~ msgid "Email" -#~ msgstr "E-Mail" - #~ msgid "Resolve Conflicts" #~ msgstr "Resolve Conflicts" +#~ msgid "Object" +#~ msgstr "Object" + #~ msgid "There were conflicts during import." #~ msgstr "There were conflicts during import." -#~ msgid "Object" -#~ msgstr "Object" +#~ msgid "my version:" +#~ msgstr "my version:" + +#~ msgid "their version:" +#~ msgstr "their version:" + +#~ msgid "resolved version:" +#~ msgstr "resolved version:" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contacting the OSM server..." + +#~ msgid "Aborting..." +#~ msgstr "Aborting..." + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "different" + +#~ msgid "true" +#~ msgstr "true" + +#~ msgid "false" +#~ msgstr "false" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Resolve {0} conflicts in {1} objects" + +#~ msgid "Change" +#~ msgstr "Change" + +#~ msgid "unnamed" +#~ msgstr "unnamed" #~ msgid "{0} object has conflicts:" @@ -22964,48 +23940,12 @@ #~ msgstr[1] "{0} objects have conflicts:" -#~ msgid "my version:" -#~ msgstr "my version:" - -#~ msgid "their version:" -#~ msgstr "their version:" - -#~ msgid "resolved version:" -#~ msgstr "resolved version:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Login name (e-mail) to the OSM account." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM username (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Unknown host" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "different" - -#~ msgid "true" -#~ msgstr "true" - -#~ msgid "false" -#~ msgstr "false" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Resolve {0} conflicts in {1} objects" - -#~ msgid "Change" -#~ msgstr "Change" - #~ msgid "Click Reload to refresh list" #~ msgstr "Click Reload to refresh list" +#~ msgid "Date" +#~ msgstr "Date" + #~ msgid "Revert" #~ msgstr "Revert" - -#~ msgid "Date" -#~ msgstr "Date" #~ msgid "" @@ -23016,30 +23956,12 @@ #~ "selected in the history list." -#~ msgid "Rotate" -#~ msgstr "Rotate" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (empty value deletes tag)" - -#~ msgid "Error parsing server response." -#~ msgstr "Error parsing server response." - -#~ msgid "Cannot connect to server." -#~ msgstr "Cannot connect to server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Add either site-josm.xml or Wiki Pages." - -#~ msgid "Tagging preset source" -#~ msgstr "Tagging preset source" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Add a new tagging preset source to the list." - -#~ msgid "Tagging preset sources" -#~ msgstr "Tagging preset sources" +#~ msgid "Email" +#~ msgstr "E-Mail" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM username (e-mail)" #~ msgid "" @@ -23050,6 +23972,54 @@ #~ "some time." +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin requires JOSM update: {0}." + #~ msgid "Commit comment" #~ msgstr "Commit comment" + +#~ msgid "Server does not support changesets" +#~ msgstr "Server does not support changesets" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (empty value deletes tag)" + +#~ msgid "Occupied By" +#~ msgstr "Occupied By" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Add all currently selected objects as members" + +#~ msgid "Add Selected" +#~ msgstr "Add Selected" + +#~ msgid "Error parsing server response." +#~ msgstr "Error parsing server response." + +#~ msgid "Cannot connect to server." +#~ msgstr "Cannot connect to server." + +#~ msgid "Tagging preset sources" +#~ msgstr "Tagging preset sources" + +#~ msgid "Tagging preset source" +#~ msgstr "Tagging preset source" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Add a new tagging preset source to the list." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Add either site-josm.xml or Wiki Pages." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin already exists" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -23061,9 +24031,21 @@ #~ msgstr "Could not download plugin: {0} from {1}" -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "image not loaded" -#~ msgstr "image not loaded" +#~ msgid "Rotate" +#~ msgstr "Rotate" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Some of the nodes are (almost) in the line" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Really mark this issue as ''done''?" + +#~ msgid "Import TCX File..." +#~ msgstr "Import TCX File..." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Import TCX file as GPS track" #~ msgid "" @@ -23074,4 +24056,7 @@ #~ "move mouse. Select: Click." +#~ msgid "image not loaded" +#~ msgstr "image not loaded" + #~ msgid "Metacarta Map Rectifier image id" #~ msgstr "Metacarta Map Rectifier image id" @@ -23083,63 +24068,24 @@ #~ msgstr "Adjust the position of the WMS layer" +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "Drawbridge" +#~ msgstr "Drawbridge" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + #~ msgid "Charge" #~ msgstr "Charge" -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Server does not support changesets" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin requires JOSM update: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin already exists" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Some of the nodes are (almost) in the line" - -#~ msgid "Drawbridge" -#~ msgstr "Drawbridge" - #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK+)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Really mark this issue as ''done''?" - -#~ msgid "Import TCX File..." -#~ msgstr "Import TCX File..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Import TCX file as GPS track" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transferred in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." #~ msgid "" @@ -23149,7 +24095,4 @@ #~ "The sources (URL or filename) of tagging preset definition files. See " #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgid "" @@ -23200,13 +24143,9 @@ #~ "format=image/png" +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS" + #~ msgid "Portcullis" #~ msgstr "Portcullis" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." #~ msgid "" @@ -23224,4 +24163,11 @@ #~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." + +#~ msgid "" #~ "Plugin archive already available. Do you want to download the current " #~ "version by deleting existing archive?\n" @@ -23244,4 +24190,8 @@ #~ "Opens the OpenStreetBugs window and activates the automatic download" +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n" + #~ msgid "sports" #~ msgstr "sports" @@ -23252,4 +24202,10 @@ #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgid "Remove Selected" +#~ msgstr "Remove Selected" + +#~ msgid "Basic" +#~ msgstr "Basic" + #~ msgid "Delete and Download" #~ msgstr "Delete and Download" @@ -23258,6 +24214,12 @@ #~ msgstr "No intersection found. Nothing was changed." -#~ msgid "Solve Conflict" -#~ msgstr "Solve Conflict" +#~ msgid "Move Down" +#~ msgstr "Move Down" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relation Editor: {0}" + +#~ msgid "Move Up" +#~ msgstr "Move Up" #~ msgid "" @@ -23275,14 +24237,4 @@ #~ "continue?" -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "An error occurred while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "The following errors occurred during mass download:" - #~ msgid "Edit Drawbridge" #~ msgstr "Edit Drawbridge" @@ -23290,14 +24242,4 @@ #~ msgid "Edit Portcullis" #~ msgstr "Edit Portcullis" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Help page missing. Create it in English." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Help page missing. Create it in English or your language." #~ msgid "Directly load TCX files from JOSM." @@ -23313,9 +24255,41 @@ #~ "eg. deleting uninteresting parts of track." +#~ msgid "Start routing" +#~ msgstr "Start routing" + #~ msgid "Remove route nodes" #~ msgstr "Remove route nodes" -#~ msgid "Start routing" -#~ msgstr "Start routing" +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Help page missing. Create it in English." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Help page missing. Create it in English or your language." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Login name (e-mail) to the OSM account." + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "The following errors occurred during mass download:" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transferred in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "An error occurred while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." #~ msgid "Error processing changeset upload response" @@ -23337,13 +24311,16 @@ #~ "Do not upload any data after this message." +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Data upload failed for unknown reason" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Cannot read numeric value from response" -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Data upload failed for unknown reason" - #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Image with path {0} does not exist or is not readable." +#~ msgid "linked" +#~ msgstr "linked" + #~ msgid "Overlap tiles" #~ msgstr "Overlap tiles" @@ -23357,7 +24334,4 @@ #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Resolve conflicts in member list of relation {0}" - -#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " -#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got " #~ msgid "" @@ -23368,21 +24342,6 @@ #~ "elements when merge decisions are applied." -#~ msgid "Undeleting Way..." -#~ msgstr "Undeleting Way..." - -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Checking whether node {0} is gone ..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Undeleting relation..." - -#~ msgid "Checking whether primitive {0} is gone ..." -#~ msgstr "Checking whether primitive {0} is gone ..." - -#~ msgid "Keep mine" -#~ msgstr "Keep mine" - -#~ msgid "Delete mine" -#~ msgstr "Delete mine" +#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " +#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got " #~ msgid "" @@ -23401,4 +24360,22 @@ #~ "{3} to cancel.
" +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Checking whether node {0} is gone ..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Undeleting relation..." + +#~ msgid "Undeleting Way..." +#~ msgstr "Undeleting Way..." + +#~ msgid "Keep mine" +#~ msgstr "Keep mine" + +#~ msgid "Checking whether primitive {0} is gone ..." +#~ msgstr "Checking whether primitive {0} is gone ..." + +#~ msgid "Delete mine" +#~ msgstr "Delete mine" + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -23413,10 +24390,10 @@ #~ msgstr "Selection too big" +#~ msgid "Error when communicating with server." +#~ msgstr "Error when communicating with server." + #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "Didn't find an historized primitive with id {0} in this dataset" -#~ msgid "Error when communicating with server." -#~ msgstr "Error when communicating with server." - #~ msgid "image loading..." #~ msgstr "image loading..." Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 16826) +++ /applications/editors/josm/i18n/po/es.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-14 10:07+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-31 18:24+0000\n" "Last-Translator: cdavila \n" "Language-Team: Spanish \n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:25+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Creando la interfaz principal de usuario" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "No se ha podido activar la proyección {0}. Se usará Mercator." -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Cambios no guardados" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Existen cambios sin guardar. ¿Desea descartarlos y continuar?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Guardar y salir" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Descartar y salir" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Advertencia" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de archivo malformado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Acerca de" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Mostrar la pantalla Acerca de..." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versión {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Último cambio en {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Versión de Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Sitio web" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Informe de errores" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Léeme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisión" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Contribución" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licencia" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Complementos" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Acerca de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "No se ha podido encontrar el archivo." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -213,16 +357,9 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Advertencia" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -231,7 +368,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Por favor, seleccione la fila a borrar" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Selecione alguno:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Unir nodos" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Añadir nodo..." @@ -243,14 +408,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -258,57 +425,57 @@ msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Introduzca las coordenadas para el nuevo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Usar grados decimales." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos denotan hemisferio Oeste/Sur" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitud" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Alinear nodos en círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Mover los nodos seleccionados a un círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -324,25 +491,58 @@ msgstr "Herramienta: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Por favor, selecciona al menos cuatro nodos." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Alinear nodos en línea recta" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Mover los nodos seleccionados en una línea." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Por favor selecciona como mínimo tres nodos" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -353,19 +553,10 @@ "el actual es {0}, el máximo es {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Violación de la capacidades del API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" -"No se ha podido inicializar la API. Por favor, inténtelo de nuevo más tarde." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Fallo en la inicialización del API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -376,5 +567,5 @@ "primitiva suprimida {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -385,46 +576,46 @@ "la máxima longitud permitida {2}. Los valores de longitud son {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Violación de la condición previa" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} nodos en vía {1} superar el máximo número permitido de nodos {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selección" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflicto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "descargar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Aumentar la vista a {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -434,30 +625,30 @@ msgstr "Vista: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "No hay nada seleccionado a lo que hacer zoom." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "No hay conflictos sobre los que acercarse" +#: ../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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona al menos dos vías para combinar." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "¿Combinar vías con diferentes relaciones?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -466,13 +657,13 @@ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../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:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "¿Cambiar direcciones?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -482,10 +673,10 @@ "alguna de ellas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Invertir y combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -493,20 +684,20 @@ msgstr "Introduzca valores para todos los conflictos." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Todas la vías están vacías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -525,23 +716,24 @@ msgstr "Copia los objetos seleccionados al portapapeles" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Por favor, seleccione algo que copiar." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Crear círculo" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Crear un círculo a partir de tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Esos nodos no están en un círculo." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -551,50 +743,51 @@ "tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Borrar" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Eliminar objetos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribuir nodos" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" @@ -602,38 +795,72 @@ "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Descargar datos del mapa del servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Archivo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Descargar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Por favor, seleccione al menos una tarea para descargar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "Descargando referencias desde OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Existió {0} conflictos durante la importación." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Errores durante la descarga" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) descargando padres de la primitiva {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar la selección mediante copiar y pegar de inmediato." @@ -653,5 +880,5 @@ msgstr "Salir de la aplicación" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -661,58 +888,73 @@ "licencia GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportar a GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportar los datos a archivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nada que exportar. Obtén algunos datos primero" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "el parametro \"{0}\" no debe ser nulo" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "Descripción de la traza GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Añadir información del autor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nombre real" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "Correo electrónico" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Derechos de autor (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefinido" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Año del copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Palabras claves" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opciones de exportación" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportar y guardar" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -723,25 +965,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Error" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Elegir una licencia predefinida" @@ -751,46 +973,49 @@ msgstr "Ayuda en línea de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Abrir en el navegador" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Editar" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Recargar" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "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:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, 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:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, 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:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -830,30 +1055,40 @@ msgstr "Unir un nodo al segmento de vía más cercano" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Unir nodo y línea" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Sin acceso directo" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Unir de todos modos" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Unir la capa inmediatamente inferior con la capa selecionada." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -863,9 +1098,9 @@ "quiere unirlos?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Unir de todos modos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -873,60 +1108,71 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Unir {0} nodos" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selección" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Invertir los nodos y vías seleccionadas" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Por favor, seleccione al menos un nodo o vía" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "arriba" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Mover objetos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "abajo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "Izquierda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "derecha" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Mover {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Mover objetos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Imposible mover objetos fuera del mundo." @@ -934,5 +1180,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nuevo" @@ -942,26 +1188,17 @@ msgstr "Crear un nuevo mapa." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "sin nombre" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Abrir un archivo." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "No se pudo leer \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -990,35 +1227,36 @@ msgstr "URL de descarga" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ortogonalizar forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Solo se permiten dos nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "La selección debe consistir solo en vías." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Por favor, seleccione una o más vías cerradas de al menos cuatro nodos." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Esta usando la proyección EPSG:4326 la cual puede producir
" @@ -1026,9 +1264,9 @@ "proyección para evitar este aviso.
¿Desea continuar?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Solo hay un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1044,11 +1282,11 @@ msgstr "Pegar los contenidos de la memoria de pegado" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Pegar etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1078,16 +1316,21 @@ msgstr "Restaurar la última acción deshecha" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Cambiar nombre de la capa" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "También cambiar nombre del archivo" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "No se ha podido cambiar el nombre del archivo \"{0}\"." @@ -1101,9 +1344,9 @@ msgstr "Invertir el sentido de todas las vías seleccionadas." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Por favor seleccione por lo menos una vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Cambiar el sentido de las vías" @@ -1111,17 +1354,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Guardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Guardar los datos actuales." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "El archivo {0} existe. ¿Sobrescribir?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1131,25 +1376,25 @@ "favor comunique esto como fallo." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Ningún documento abierto luego nada por grabar." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Documento vacío" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "El documento no contiene datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Guardar igualmente" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflictos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1159,54 +1404,77 @@ "gestionarán como si rechazara todo. ¿Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Rechazar conflictos y guardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Guardar el archivo OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Guardar el archivo GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Guardar capa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "No se pudo salvaguardar el archivo." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Extensión de archivos desconocida: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Ocurrió un error mientras se comunicaba con el servidor
Detalles: " +"{0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Ocurrió un error al restaurar el archivo de salvaguarda." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Extensión de archivo desconocida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Ocurrió un error al guardar." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Ocurrió un error al restaurar el archivo de salvaguarda." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Guardar como..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Guardar los datos actuales en un nuevo archivo." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Seleccionar todo" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1241,16 +1509,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Cerrar" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Separar vía" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Separar vía por el nodo seleccionado" @@ -1260,5 +1528,5 @@ msgstr "La selección actual no se puede usar para separar." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1266,5 +1534,5 @@ msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1280,9 +1548,9 @@ "seleccione la vía también." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Los nodos seleccionados no comparten la misma vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1290,10 +1558,10 @@ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Debe seleccionar dos o más nodos para dividir una vía circular." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1303,8 +1571,9 @@ "nodos de la mitad de la vía)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Se ha copiado una membresía de relación basada en roles a todas las vías " @@ -1312,13 +1581,14 @@ "Debe verificar esto y corregirlo donde sea necesario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Una relación de miembros se ha copiado a todas las nuevas vías.\n" "Debes verificar y corregir esta cuando sea necesario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1339,56 +1609,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Selecione alguno:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que sea usado por más de una vía, o" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." 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:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1402,9 +1672,9 @@ "seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Nodo despegado" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1412,5 +1682,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1426,144 +1696,95 @@ msgstr "Deshacer la última acción" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Deseleccionar todo" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Deseleccionar todos los objetos" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Deseleccionar todas (Foco)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Deseleccionar todos (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Actualizar datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Actualiza la actual capa de datos desde el servidor (re-descargas de datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de datos?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Sin datos" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Fallo al actualizar las primitivas seleccionadas." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Actualización fallida" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "No se encontró la capa de datos GPX" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "" "No se puede encontrar la primitiva con el id {0} en el conjunto de datos " "actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Falta la primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Actualización de selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Actualiza las primitivas seleccionadas actualmente desde el servidor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "No hay primitivas seleccionadas para actualizar" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selección vacía" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Subir todos los cambios al servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objetos que añadir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objetos que modificar:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objetos que borrar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "¿Subir estos cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Subir cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "" "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Ningún cambio que subir" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Subiendo" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizar {0} {1} únicamente" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Sincronizar el conjunto de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1585,17 +1806,17 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Conflicto detectado" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "Retorno de valor inexperado. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1611,5 +1832,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1618,57 +1839,60 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -" Subida al servidor fallida debido a que su actual " -"conjunto de datos
viola una condición previa.
El mensaje de error es:" -"
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Violación de condición previa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -" Subida falladadebido a que ha intentado eliminar " -"una primitiva
en el servidor la cual ya está eliminada.
El mensaje " -"de error es:
{0} " - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitiva ya eliminada" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "Subida fallida.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Subida a la API de OSM fallida" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Actualizando primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Subir todos los cambios al servidor OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"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." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objetos que añadir:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objetos que modificar:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1756,42 +1980,54 @@ msgstr "Avance lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Datos GPX descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Datos GPS en bruto" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "No se importó ningún dato." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Descargando {0} de {1} ({2} pendientes)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Subiendo datos" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Se han producido los siguientes errores durante la descarga masiva:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Errores durante la descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1809,21 +2045,21 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Primitivas movidas o borradas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Modo de borrado" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Borrar nodos o vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1831,5 +2067,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1839,786 +2075,23 @@ "los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Dibujar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Dibujar nodos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Modo: Dibujar foco" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Añadir nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Añadir nodo a la vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Conectar la vía existente al nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Crear un nodo nuevo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Seleccionar el nodo bajo el cursor." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Insertar un nuevo nodo en la vía." -msgstr[1] "Insertar un nuevo nodo en {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Continuar la vía desde el último nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Finalizar dibujo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Extruir" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Crear áreas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Extruir vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" -"Soltar el botón del ratón para seleccionar los objetos en el rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Soltar el botón del ratón para parar de rotar." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Arrastre el segmento de la vía para hacer un rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Desplace la flecha de reproducción y suéltela cerca de la traza para " -"reproducir audio desde ese punto; usa MAYUS+soltar para sincronizar el audio " -"en ese punto." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Seleccionar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Seleccionar, mover y rotar objetos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Añadir y mover un nuevo nodo virtual a la vía." -msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Mover elementos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" -"Movió más de {0} elementos. Desplazar un gran número de elementos es a " -"menudo un error.\n" -"¿Quiere moverlos realmente?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Moverlos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Deshacer mover" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Soltar el botón del ratón para parar de moverse. Ctrl para unir con en nodo " -"más cercano." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Mover objetos arrastrando; Mayúsculas para añadir a la selección (Ctrl para " -"alternar); Shift-Ctrl para rotar lo seleccionado, o cambiar la selección" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Ampliar/reducir" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Alejar/acercar y mover mapa" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Zoom arrastrando o Ctrl +. o Ctrl+,; mover con Ctrl+arriba, izquierda, " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Buscar ..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Búsqueda de objetos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "No se han cargado los datos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Por favor, introduzca una cadena de búsqueda." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "reemplazar selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "añadir a la selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "eliminar de la selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "distinguir mayúsculas" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "expresión regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -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:85 -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:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - clave 'type' con cualquier valor. Probar también *=valor, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Búsquedas especiales:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - tipo de objeto: nodo, vía, relación (node, way, " -"relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - objetos con un ID determinado" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - todos los objetos modificados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - todos los objetos seleccionados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - todos los objetos incompletos" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - todos los objetos sin etiquetar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - todos los hijos de todos los objetos que cumplan " -"la expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - todos los padres de todos los objetos que " -"cumplan la expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Usar | o OR para realizar búsquedas combinadas con el operador " -"lógico O (disyunción)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Usar ( and ) para agrupar expresiones" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Buscar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Iniciar búsqueda" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "No se encontraron coincidencias para \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Se han encontrado {0} coincidencias" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"La expresión regular \"{0}\" presenta un error en la posición {1}, error " -"completo:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"La clave no puede estar vacía cuando se usa el operador de etiqueta. Ejemplo " -"de uso: clave=valor" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Tipo de primitivo desconocido: {0}. Los valores permitidos son nodo, vía o " -"relación" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Credencial de autentificación inexperada: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "No se encuentran los argumentos de or" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "No se encuentran los argumentos de not" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Se esperaba un cierre de paréntesis." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Número de parámetros incorrecto para el operador de nodos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un " -"número de nodos o un intervalo, por ejemplo nodos:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Contacto {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Descargando..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Imposible leer desde la URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Error de análisis sintáctico en URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Error mientras se comunicaba con el servidor" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "Añadir {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "Cambiar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Eliminar \"{0}\" de {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Establecer {0}={1} para {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objeto" -msgstr[1] "objetos" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Eliminar \"{0}\" de {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Establecer {0}={1} para {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" -"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " -"presente" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Resolver los conflictos en las coordenadas en {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "no se puede resolver los conflictos pendientes" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relación con conclicto" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol " -"{2}.\n" -"¿Borrar de la relación?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Borrar de la relación" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Dividir segmento de vía" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Está a punto de borrar nodos fuera del área que a bajado.
Esto puede " -"causar problemas ya que otros objetos (que no puede ver) pueden estar " -"usándolos.
¿Realmente quiere borrar?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Resolver los conflictos en el estado de borrado en {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Mover" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nodo" -msgstr[1] "nodos" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Purgando 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "eliminando referencia de la vía {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Advertencia: Purgando vía {0} porque se redujo el número de nodos por " -"debajo de 2. El actual es {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "eliminando referencia de la relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Resolver conflictos en la lista de miembros de la relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, 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 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Rotar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Secuencia" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Resolver conflictos de versión para {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Resolver conflictos en la lista de nodos de la vía {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "El conjunto de datos principal no incluye el nodo {0}" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "¿Aplicar?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Al modificar el sentido de esta vía se sugieren los siguientes cambios en " -"las propiedades de la vía y sus nodos con el fin de mantener la consistencia " -"de los datos." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relación" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Rol antiguo" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Rol nuevo" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Clave antigua" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Valor anterior" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Clave nueva" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nuevo valor" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Aplicar los cambios seleccionados" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "No aplicar cambios" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Propiedades de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Roles en la relaciones referidos a" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Correción automática de etiquetas" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"El archivo de preferencias contiene errores. Realizando copia de seguridad " -"de uno antiguo a {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Preferencias guardadas en {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "No se han podido cargar las preferencias desde el servidor." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2630,8 +2103,824 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "el parámetro ''{0}'' no debe ser nulo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Dibujar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Dibujar nodos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Añadir nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Añadir nodo a la vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Conectar la vía existente al nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Crear un nodo nuevo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Seleccionar el nodo bajo el cursor." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Insertar un nuevo nodo en la vía." +msgstr[1] "Insertar un nuevo nodo en {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Continuar la vía desde el último nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Finalizar dibujo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Extruir" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Crear áreas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Extruir vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" +"Soltar el botón del ratón para seleccionar los objetos en el rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Soltar el botón del ratón para parar de rotar." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Arrastre el segmento de la vía para hacer un rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Desplace la flecha de reproducción y suéltela cerca de la traza para " +"reproducir audio desde ese punto; usa MAYUS+soltar para sincronizar el audio " +"en ese punto." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Seleccionar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Seleccionar, mover y rotar objetos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Añadir y mover un nuevo nodo virtual a la vía." +msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Mover elementos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Movió más de {0} elementos. Desplazar un gran número de elementos es a " +"menudo un error.\n" +"¿Quiere moverlos realmente?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Moverlos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Deshacer mover" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Soltar el botón del ratón para parar de moverse. Ctrl para unir con en nodo " +"más cercano." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Mover objetos arrastrando; Mayúsculas para añadir a la selección (Ctrl para " +"alternar); Shift-Ctrl para rotar lo seleccionado, o cambiar la selección" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Ampliar/reducir" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Alejar/acercar y mover mapa" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Zoom arrastrando o Ctrl +. o Ctrl+,; mover con Ctrl+arriba, izquierda, " +"abajo, derecha; mover el zoom con el botón derecho" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Buscar ..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Búsqueda de objetos." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Por favor, introduzca una cadena de búsqueda." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "reemplazar selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "añadir a la selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "eliminar de la selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "distinguir mayúsculas" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "expresión regular" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +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 +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 +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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - clave 'type' con cualquier valor. Probar también *=valor, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Búsquedas especiales:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - tipo de objeto: nodo, vía, relación (node, way, " +"relation)" + +#: ../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" + +#: ../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 +msgid "modified - all changed objects" +msgstr "modified - todos los objetos modificados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - todos los objetos seleccionados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - todos los objetos incompletos" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - todos los objetos sin etiquetar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - todos los hijos de todos los objetos que cumplan " +"la expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - todos los padres de todos los objetos que " +"cumplan la expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "" +"Usar | o OR para realizar búsquedas combinadas con el operador " +"lógico O (disyunción)" + +#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Buscar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Iniciar búsqueda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Se han encontrado {0} coincidencias" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"La expresión regular \"{0}\" presenta un error en la posición {1}, error " +"completo:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"La clave no puede estar vacía cuando se usa el operador de etiqueta. Ejemplo " +"de uso: clave=valor" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Tipo de primitivo desconocido: {0}. Los valores permitidos son nodo, vía o " +"relación" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Credencial de autentificación inexperada: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "No se encuentran los argumentos de or" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "No se encuentran los argumentos de not" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Se esperaba un cierre de paréntesis." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Número de parámetros incorrecto para el operador de nodos." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un " +"número de nodos o un intervalo, por ejemplo nodos:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Cargar selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Contacto {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, 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 +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}" +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}''" +msgstr "Eliminar \"{0}\" de {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objeto" +msgstr[1] "objetos" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Eliminar \"{0}\" de {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Establecer {0}={1} para {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Resolver conflicto" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "No se encontraron coincidencias para \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " +"presente" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Resolver los conflictos en las coordenadas en {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +msgstr "" +"La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol " +"{2}.\n" +"¿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:584 +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?" +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:402 +msgid "Split way segment" +msgstr "Dividir segmento de vía" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Está a punto de borrar nodos fuera del área que se ha descargado.
Esto " +"puede causar problemas ya que otros objetos (que no puede ver) pueden estar " +"usándolos.
¿Esta seguro que quiere borrarlo?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Borrar de la relación" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Resolver los conflictos en el estado de borrado en {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Mover" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nodo" +msgstr[1] "nodos" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Purgando 1 primitiva" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "eliminando referencia de la vía {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Advertencia: Purgando vía {0} porque se redujo el número de nodos por " +"debajo de 2. El actual es {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "eliminando referencia de la relación {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Rotar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Secuencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Resolver {0} conflictos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Resolver conflictos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Resolver conflictos en la lista de nodos de la vía {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "El conjunto de datos principal no incluye el nodo {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "¿Aplicar?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Al modificar el sentido de esta vía se sugieren los siguientes cambios en " +"las propiedades de la vía y sus nodos con el fin de mantener la consistencia " +"de los datos." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relación" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Rol antiguo" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Rol nuevo" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Clave antigua" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Valor anterior" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Clave nueva" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nuevo valor" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Aplicar los cambios seleccionados" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "No aplicar cambios" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Propiedades de " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Roles en la relaciones referidos a" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Correción automática de etiquetas" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Preferencias guardadas en {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +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 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\"" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2659,5 +2948,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2666,27 +2955,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2694,13 +2983,13 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2708,22 +2997,22 @@ msgstr[1] "relaciones" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relaciones" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../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:10 +#: ../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:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2737,23 +3026,23 @@ msgstr[1] "miembros {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "vía" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "ferrocarril" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vía fluvial" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "uso del suelo" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2812,5 +3101,5 @@ msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Vía de tipo área sin cerrar" @@ -2951,9 +3240,4 @@ "frente a esta incongruencia. Se mantiene mi primitiva. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [ID: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2970,5 +3254,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "fondo" @@ -2979,8 +3263,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "WGS84 Geográfico" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2996,5 +3280,5 @@ "y cree una nueva capa en otra zona." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Zona Lambert (Francia)" @@ -3017,22 +3301,138 @@ msgstr "UTM Zona {0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "No pudieron leerse los marcadores." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "No pudieron escribirse los marcadores." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "No mostrar de nuevo" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +" Subida al servidor fallida debido a que su actual " +"conjunto de datos
viola una condición previa.
El mensaje de error es:" +"
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Violación de condición previa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "desconocido" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Excepción inesperada" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"No se ha podido conectar con el servidor OSM. Por favor, verifique su " +"conexión a Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +msgid "Unknown host" +msgstr "Host desconocido" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +" Subida falladadebido a que ha intentado eliminar " +"una primitiva
en el servidor la cual ya está eliminada.
El mensaje " +"de error es:
{0} " + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "El mensaje del dia no está disponible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- la versión en ejecución es la {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Descargando \"Mensaje del día\"" @@ -3059,5 +3459,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." -msgstr "Contraseña OSM" +msgstr "Contraseña de OSM" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 @@ -3113,63 +3513,57 @@ msgstr "Contraseña" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"No se puede encontrar traducción para el escenario {0}. Revertiendo a {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opciones" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Mostrar esta ayuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Argumento de geometría standard de unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Bajar el rectángulo límite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" -msgstr "Abrir archivo (como gps crudo si es .gpx" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgstr "Abrir archivo (como gps en bruto si es .gpx" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" -msgstr "Bajar el rectángulo límite como gps crudo" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +msgstr "Bajar el rectángulo límite como gps en bruto" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Seleccionar dentro de la búsqueda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Lanzar en modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" -msgstr "Restablecer las preferencias a los valores por defecto" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +msgstr "Restablecer las preferencias a los valores predeterminados" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." -msgstr "Establezca idioma" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +msgstr "Establezca el idioma." + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "ejemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3179,51 +3573,51 @@ "asegúrese que carga algún dato antes de --seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "En vez de --bajar= puede especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Activando los complementos actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Cargando los primeros complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Ajustes predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Cargando los complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "La opción de configuración {0} ha sido eliminada y ya no se usa" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +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 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3231,21 +3625,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Interruptor de la vista de rejilla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Cambiar vista a pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3283,5 +3677,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:109 msgid "Zoom out" -msgstr "Alejarse" +msgstr "Reducir" #: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44 @@ -3289,53 +3683,68 @@ msgstr "escalar" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "La longitud geográfica en el puntero del ratón." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "El nombre del objeto en el puntero del ratón" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "La latitud geográfica en el puntero del ratón." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "El ángulo entre el segmento actual de vía y el anterior." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." -msgstr "La dirección (brújula) del segmento de línea dibujándose." - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +msgstr "La dirección (brújula) del segmento de línea que se está dibujando." + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." -msgstr "La longitud del nuevo segmento de línea dibujándose." - -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +msgstr "La longitud del nuevo segmento de línea que se está dibujando." + +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(sin objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "capa no listada" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "La capa {0} debe esta en el listado de capas" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contactando con el servidor OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "La capa ''{0}'' debe estar en la lista de capas" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Error mientras se analizaba sintácticamente" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3350,5 +3759,7 @@ msgid "" "partial: different selected objects have different values, do not change" -msgstr "parcial: distintos objetos seleccionados tienen valores diferentes" +msgstr "" +"parcial: distintos objetos seleccionados tienen valores diferentes, no " +"cambiar" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 @@ -3357,4 +3768,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inicializar" @@ -3384,22 +3796,22 @@ #, java-format msgid "role {0} is not participating in compare pair {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +msgstr "el rol {0} no participa en la pareja de comparación {1}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3407,73 +3819,77 @@ msgstr "Nodos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflito de etiqueta pendiente de ser resuelto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Etiquetas ({0} conflictivas)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} etiquetas conflictivas pendientes de ser resueltas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Nodos (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +"Lista de nodos fusionados congelada. No hay conflictos pendientes en la " +"lista de nodos de esta vía" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Nodos (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendientes en la lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Miembros (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " "relation" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +"Lista de miembros fusionados congelada. No hay conflictos pendientes en la " +"lista de miembros de esta relación" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Miembros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendientes en la lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" -msgstr "Ninguna propiedad con conflictos pendiente" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +msgstr "Ningún conflicto de propiedades pendiente" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Propiedades (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" -msgstr "Conflictos de propiedad a la espera de ser resueltos" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +msgstr "Conflictos de propiedades pendientes de resolver" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Resolución de conflictos" @@ -3510,5 +3926,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Mi versión" @@ -3521,5 +3937,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3531,9 +3947,9 @@ "decisions are applied." msgstr "" -"Lista de elementos fusionados. Sustituirá a mi elementos cuando la decisión " -"de combinarlos sea aplicada." +"Lista de elementos fusionados. Sustituirán a mis elementos cuando se aplique " +"la decisión de combinarlos." #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Su versión" @@ -3561,5 +3977,6 @@ msgid "Copy my selected elements to the end of the list of merged elements" msgstr "" -"Copiar mis nodos seleccionados al final de la lista de nodos fusionados" +"Copiar mis elementos seleccionados al final de la lista de elementos " +"fusionados" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465 @@ -3568,5 +3985,5 @@ "merged elements" msgstr "" -"Copiar mis elementos seleccionado antes del primer elemento seleccionado en " +"Copiar mis elementos seleccionados antes del primer elemento seleccionado en " "la lista de elementos fusionados" @@ -3612,5 +4029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "Mover hacia arriba los elementos seleccionados en una posición" +msgstr "Subir los elementos seleccionados una posición" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 @@ -3620,10 +4037,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "Mover ha abajo las entradas seleccionadas en una posición" +msgstr "Bajar las entradas seleccionadas una posición" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3651,6 +4067,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 msgid "Unfreeze the list of merged elements and start merging" -msgstr "" -"Descongelar la lista actual de elementos fusionados y conmenzar la fusión" +msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788 @@ -3659,6 +4074,6 @@ "Click {0} to start merging my and their entries" msgstr "" -"Hacer clic{0} para iniciar la fusión de las entradas " -"mías y de suyas" +"Pulsar {0} para iniciar la fusión de mis entradas y " +"las suyas" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 @@ -3668,6 +4083,6 @@ "html>" msgstr "" -"Hacer clic{0} para terminar la fusión de las entradas " -"mías y suyas" +"Pulsar {0} para terminar la fusión de mis entradas y " +"las suyas" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 @@ -3703,14 +4118,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "el parámetro '{0}' no debe ser nulo" @@ -3739,12 +4154,14 @@ msgid "Merged nodes not frozen yet. Can't build resolution command" msgstr "" +"Los nodos fusionados aún no están congelados. No se puede construir la orden " +"de resolución." #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "índice de columna inexperado. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3755,19 +4172,19 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Comunicación fallida con el servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Sí, deshacer el borrado de ellos también" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "No, calcelar la operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3779,9 +4196,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" -msgstr "¿Deshacer el borrado de los nodos adicionanles?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +msgstr "¿Deshacer el borrado de los nodos adicionales?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3791,108 +4208,112 @@ msgstr "" "Hay {0} primitivos adicionales a los que se refiere la relación {1}" -"
que están borrados en el servidor.

~Quiere deshacer también el " +"
que están borrados en el servidor.

¿Quiere deshacer también el " "borrado de los primitivos?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "¿Deshacer borrado de primitivos dependientes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Propiedade de mi conjunto de datos, es decir el conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " "elements when merge decisions are applied." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +"Propiedades en el elemento fusionado. Sustituirán a las propiedades de mis " +"elementos cuando se apliquen las decisiones de fusionar." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +"Propiedades en su conjunto de datos, esto es, en el conjunto de datos del " +"servidor" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Estado borrado:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Estado visible:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(ninguno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "no borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "no visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Mantener un clon de la versión local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" -msgstr "Eliminar físicamente desde el conjunto de datos locales" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +msgstr "Eliminar físicamente del conjunto de datos locales" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Mantener mis coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Mantener sus coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Conflicto no resuelto entre las diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Mantener mi estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Mantener su estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Mantener mi estado visible" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Sí, reiniciar el id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "No, abortar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3905,5 +4326,5 @@ "asignará
un nuevo identificador.
¿Está de acuerdo? " -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Reiniciar el id a 0" @@ -3928,12 +4349,11 @@ msgstr "Eliminar desde el conjunto de datos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Conflicto entre estado visibles sin decidir" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3969,4 +4389,5 @@ msgid "The merged dataset will not include a tag with key {0}" msgstr "" +"El conjunto de datos fusionado no incluirá una etiqueta con la clave {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48 @@ -3978,10 +4399,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3990,10 +4411,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4002,5 +4423,5 @@ msgstr "Valor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -4028,8 +4449,11 @@ msgid "Keep the selected key/value pairs from the local dataset" msgstr "" +"Mantener la pareja clave/valor seleccionado del conjunto de datos locales" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" +"Mantener la pareja clave/valor seleccionado del conjunto de datos del " +"servidor" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380 @@ -4045,5 +4469,5 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Su conjunto de datos no incluye una etiqueta con la clave {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4060,9 +4484,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4070,5 +4494,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4100,6 +4524,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4107,36 +4531,53 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "Cancelar la resolución de conflictos y cerrar el cuadro de diálogo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +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 +msgid "Apply Resolution" +msgstr "Aplicar resolución" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Continuar de todos modos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "Continuar resolviendo" + +#: ../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 "Resolver los conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -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:165 -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:166 -msgid "Apply Resolution" -msgstr "Aplicar resolución" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Aplicar resolución parcial" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "Continuar resolviendo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Resolver conflictos de versión para {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4153,24 +4594,25 @@ msgid "Failed to load history from the server. Details:
{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +"Fallo al cargar el historial desde el servidor. Detalles:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +msgstr "índice fuera de los límites. Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Historial del elemento" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "" @@ -4178,74 +4620,107 @@ #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Mostrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Mostrando el historial de la primitiva seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Capas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Borrar la capa seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Hay cambios sin guardar. ¿Eliminar la capa de todas formas?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Eliminar capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "¿Realmente quiere borrar toda la capa?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Información" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "sí" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Borrar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Cambia estado de visibilidad de la capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Mostrar/Esconder Texto/Iconos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" -"Interruptor de la visiblidad del estado de los marcadores de texto e iconos." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Capas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Borrar la capa seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Unir la capa inmediatamente inferior con la capa selecionada." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Mover la capa seleccionada una fila abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Unir la capa inmediatamente inferior con la capa selecionada." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Capas: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Panel informativo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4254,22 +4729,28 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Un valor vacío elimina la clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "¿Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4278,85 +4759,90 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Por favor, selecciona una etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Por favor, selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor, seleccione los objetos a los que desea cambiar las propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Propiedades/Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Propiedades de los objetos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "¿Seguro de eliminar la selección de la relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Añadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Editar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Eliminar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Borrar la clave seleccionada en todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propiedades: {0} / Miembros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Propiedades / Miembros" @@ -4365,63 +4851,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Abrir una lista de todas las relaciones." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relaciones: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Borrar la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Crear un anueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relaciones: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Borrar la relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Abrir una ventana de selección." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zoom a los elementos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Refrescar la lista de selección." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoom a la selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4430,5 +4918,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4437,5 +4925,5 @@ msgstr[1] "{0} relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4446,5 +4934,10 @@ msgstr "Desacoplar el panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4453,143 +4946,413 @@ "herramientas de la izquierda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Haga click para minimizar/maximizar el contenido del panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Abrir una lista de la gente trabajando en los objetos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "Nº de objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autores: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Descargar relación de miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Descargar área" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Borrar la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Descargar las teselas visibles" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Conflictos en dato" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "No se seleccionó ninguna relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Descargando complemento {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relaciones" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Eliminar elementos de las relaciones" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Fallo al actualizar las primitivas seleccionadas." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Mover los miembro(s) seleccionos hacia arriba" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Mover los miembros seleccionados hacia abajo" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Eliminar todos los objetos seleccionados de la relación" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Borrar la relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Continuar resolviendo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Conflictos en dato" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Guardar los datos actuales." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Aplicar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "Aceptar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +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:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Descargar todas las vías y nodos incompletos de esta relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Descargar miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "Aplicar rol" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Sí, purgarlo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "confirmar la acción del control remoto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Alejar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Mover los miembros seleccionados hacia abajo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Se refiere a" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "Vinculado" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Aplicar cambios" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Básico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Ocupado por" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "enlazado" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Mover hacia arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Mover los miembro(s) seleccionos hacia arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Añadir seleccionado" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Añadir todos los objetos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Eliminar seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Eliminar todos los objetos seleccionados de la relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Ordenar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Ordenar los miembros de la relación seleccionada o toda la lista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Mueve hacia abajo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Mover los miembros seleccionados hacia abajo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Eliminar el miembro en la fila de tabla actual de esta relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Descargar miembros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "Miembros: {0} (enlazados: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor de relación: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "Descargar relación de miembros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Existió {0} conflictos durante la importación." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "Conflictos en dato" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Crear una nueva relación en la capa \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Editar una nueva relación en la capa \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Editar la relación nº {0} en la capa \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Cargar selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4599,5 +5362,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4607,25 +5370,22 @@ msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Actualizar las propiedades de hasta {0} objeto" -msgstr[1] "Actualizar las propiedades de hasta {0} objetos" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Marcadores" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Por favor, introduzca las coordenadas deseadas primero." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Por favor, introduzca un nombre para la localización." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Cambiar localización" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Seleccione un marcador primero." @@ -4659,17 +5419,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Fuentes de datos y tipos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Descargar como nueva capa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Descargar área" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4677,5 +5437,5 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4684,13 +5444,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Please, introduzca la cadena de caracteres que desea buscar" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "No se pueden leer los resultados de lugares desde el servidor" @@ -4698,5 +5458,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Introduzca un lugar para buscar:" @@ -4704,5 +5464,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4710,6 +5470,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nombre" @@ -4748,6 +5508,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4770,15 +5530,15 @@ msgstr "tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "próximo a" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4787,5 +5547,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Mapa desplazable" @@ -4817,5 +5577,11 @@ msgstr "Historial para {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Cerrar el diálogo" @@ -5557,5 +6323,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5722,60 +6488,60 @@ msgstr "Versión" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Imágenes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Leer gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "No hay hora para el punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "" "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Leyendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Imagenes Geoetiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Iniciar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Finalizar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5783,138 +6549,128 @@ msgstr[1] "imagenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} dentro de la traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sincronizar reloj" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Imágenes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Imagen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria del GPS (diferencia con la foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora con la del receptor GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "La hora no pudo ser analizada sintácticamente." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personalice el dibujo de línea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Usar las preferencias globales" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Dibujar las líneas entre puntos en esta capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "No dibujar las líneas entre puntos en esta capa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Seleccione las opciones de dibujo de línea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personalizar colores" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "Aceptar" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Seleccionar una color" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Marcadores desde puntos nombrados" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Puntos de traza nombrados desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importar audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "archivos Wave Audio (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Marcadores de audio desde {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importar imágenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5923,5 +6679,5 @@ msgstr[1] "{0} trazas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5930,5 +6686,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5937,30 +6693,30 @@ msgstr[1] "{0} nodos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nombre: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Descripción: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Rango de tiempo " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Longitud: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5970,43 +6726,43 @@ "peligroso.
Si quiere subir trazas, consulte aquí:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces (EN)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Convertido desde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Descargar datos de OSM a lo largo de esta traza" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Descargar todo entre:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -6017,9 +6773,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "No hay traza gpx disponible en la capa para asociar el audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6030,5 +6786,5 @@ "comienzo." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6038,47 +6794,47 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6103,5 +6859,5 @@ msgstr[1] "pistas" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6109,5 +6865,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6116,5 +6872,5 @@ msgstr[1] "una traza con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6123,5 +6879,5 @@ msgstr[1] "{0} formado por las trazas {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6140,5 +6896,5 @@ msgstr[1] "marcadores" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6147,9 +6903,9 @@ msgstr[1] "{0} consiste en los marcadores {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sincronizar audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6157,20 +6913,20 @@ "Necesita pausar el audio en el momento que oiga su entrada de sincronización" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Audio sincronizado en el punto {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "No se puede sincronizar en la capa que se escuchaba." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Crear un marcador de audio en la cabecera de escucha" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6180,10 +6936,18 @@ "marcador." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "No existen marcadores de audio en esta capa desde los que desplazar." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Mostrar/Esconder Texto/Iconos" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" +"Interruptor de la visiblidad del estado de los marcadores de texto e iconos." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6193,5 +6957,5 @@ "pista de sonido estaba reproduciendo (rebasado el primer marcador)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6201,30 +6965,30 @@ "marcador de audio o a un punto de traza, en donde quiera sincronizar." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "No se ha podido crear un marcador de audio nuevo" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(La URL era: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Error mostrando la URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Preferencias avanzadas" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" "Establecer valores de preferencias manualmente. ¡Utilícelo con precaución!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6232,14 +6996,14 @@ msgstr "Buscar: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "El valor actual es el de por defecto" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "El valor por defecto es ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6247,13 +7011,13 @@ "usado todavía)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Por favor, seleccione la fila a editar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6261,14 +7025,14 @@ msgstr "Nuevo valor de {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Por favor, seleccione la fila a borrar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Introduzca un par parámetro/valor" @@ -6411,40 +7175,40 @@ msgstr "Calibración grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Color" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de representación {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Seleccionar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Seleccionar un color para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Establecer como predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Establecer todo como predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Colores usados por diferentes objetos en JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Colores" @@ -6787,5 +7551,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 msgid "Map Paint Styles" -msgstr "" +msgstr "Estilos de semiología cartográfica" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 @@ -6793,46 +7557,55 @@ msgstr "Estilo usado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configurar los complementos disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Descargar lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configurar sitios ..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Añadir URL de la descripción del componente de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Por favor seleccione una entrada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Editar la URL de la descripción del componente de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "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:142 msgid "Configure Plugin Sites" msgstr "Configurar los sitios de complementos" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Opciones de visualización" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6840,29 +7613,29 @@ msgstr "Varios ajustes que manejan la presentación visual del programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Ajustes de la conexión" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Configuración del servidor OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Ajustes del mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Ajustes para la proyección del mapa y la interpretación de datos" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Configuración de audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Configuración del audio player y de los marcadores" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto" @@ -6965,59 +7738,61 @@ msgstr "Atajo de teclado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "Ordenar descripción: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Página web: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "Versión: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "Rutas del icono" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "Copiar predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Por favor, seleccione una fila para copiar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Borrar la fuente seleccionada de la lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7209,33 +7984,33 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Más información sobre esta característica" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Atributos opcionales" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usar preferencia ''{0}'' del grupo ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Usar preferencia ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "vía sin salida" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7246,15 +8021,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Los elementos del tipo {0} son soportados" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7264,18 +8039,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -7286,33 +8061,36 @@ msgstr "Grupo de predefinidos ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Contactando con el servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descargando puntos {0} al {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Descargando datos OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, Posiblemente faltan algunas etiquetas." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Preparando datos..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "No se pudo leer \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7320,21 +8098,21 @@ msgstr "Archivos GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Marcadores desde {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "El archivo \"{0} no existe" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7352,10 +8130,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7363,48 +8160,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Archivos NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Sentencias mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Errores de suma de verificación: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Sentencias desconocidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Coordenadas cero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Éxito en la importación NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "¡Fallo en la importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7415,15 +8211,15 @@ "{0} a {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7431,23 +8227,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Abriendo conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Subiendo..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Escaneando directorio {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7491,9 +8300,4 @@ msgstr "Inicio de sesión" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Abortando..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7506,5 +8310,5 @@ #, java-format msgid "mandatory attribute ''{0}'' missing" -msgstr "" +msgstr "atributo \"{0}\" obligatorio perdido" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74 @@ -7512,4 +8316,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo, " +"obtenido \"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77 @@ -7518,4 +8324,6 @@ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo " +"(>=0), obtenido \"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91 @@ -7523,4 +8331,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido " +"\"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94 @@ -7529,4 +8339,6 @@ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), " +"obtenido \"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114 @@ -7535,4 +8347,6 @@ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo booleano, obtenido " +"\"{1}\"" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174 @@ -7542,4 +8356,10 @@ "''{1}''" msgstr "" +"valor ilegal para al atributo obligatorio \"{0}\" de tipo OsmPrimitiveType, " +"obtenido \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -7547,39 +8367,39 @@ msgstr "Error durante el análisis sintáctico." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Archivos del servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Versión desconocida" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Falta número de versión en los datos OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Versión desconocida: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Encontrado elemento en una no Vía" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " no tiene ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Encontrada una etiqueta fuera de una relación." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" @@ -7588,10 +8408,10 @@ "valor {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." @@ -7599,13 +8419,13 @@ "Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor {2}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta sin ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Objeto con id=0 ilegal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7615,46 +8435,66 @@ "valor {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Falta el atributo necesario \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Preparando datos OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "id del nodo mal formado" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Descargando historial..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Contactando con el servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7663,5 +8503,18 @@ "conexión a Internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), 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 #, java-format msgid "" @@ -7670,16 +8523,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), faltan {3}. Actualizando {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Actualizar complementos" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Descarga de complementos" @@ -7696,5 +8544,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7704,23 +8552,23 @@ "Complementos {0} descargados correctamente. Por favor, reinicie JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Descargando complemento {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Saltar descarga" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Versión de JOSM {0} requerida para el complemento {1}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Descargar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Salta la descargar" @@ -7731,19 +8579,17 @@ msgstr "Ha ocurrido un error en el complemento {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Advertencia - Se a requerido la carga del complemento {0} . Este complemento " "ya no es necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -7752,15 +8598,15 @@ "encontrado" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Complemento no encontrado: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "La última actualización de los complementos fue hace más de {0} días" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7770,12 +8616,12 @@ "aviso
cambiando la opción de configuración 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Deshabilitar complemento" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -7783,9 +8629,9 @@ "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Mantener componente" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7795,5 +8641,5 @@ "permiso para escribir sobre los existentes" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7803,10 +8649,10 @@ "\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "De acuerdo a la información del componente, el autor es {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7815,9 +8661,9 @@ "informar del error." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "¿Se debe deshabilitar el complemento?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7827,27 +8673,23 @@ "JOSM para descargarle del programa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"El componente no pudo ser eliminado. Por favor informe del problema a los " -"administradores de JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Información" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "No se ha encontrado información del complemento." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "no hay descripción disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Más detalles" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7856,13 +8698,18 @@ msgstr[1] "Información del complemento descargada de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "No se ha encontrado información del complemento." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Todos los complementos instalados están actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7875,9 +8722,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Descargar los complementos que faltan" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7890,57 +8737,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "desconocido" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Complemento incluido en JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Error al leer el archivo de información del complemento: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Esto está despues del final de la grabación" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Error reproduciendo sonido" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "No hacer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Informar del error" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7955,18 +8780,18 @@ "de JOSM, por favor, considere enviar un informe de error." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Excepción inesperada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Por favor presente una \"ticket\" en {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Incluya los pasos previos al error (lo más detalladamente posible)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7976,17 +8801,34 @@ "complementos antes de comunicar un fallo." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Asegúrese de incluir la siguiente información:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(El texto ya ha sido copiado a tu portapapeles.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "No mostrar de nuevo" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -8000,5 +8842,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -8008,5 +8850,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -8017,13 +8859,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Pista: Usted puede editar los atajos en las preferencias.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Crear rejilla de vías" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8033,21 +8890,21 @@ "poseen varios nodos y uno de ellos en común" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Seleccionar dos caminos con un nodo en común" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Seleccionar dos vías con solo un nodo en común" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Crear rejilla de vías" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Subir traza" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8055,75 +8912,76 @@ msgstr "Subir trazas" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Público" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Se ha seleccionado hacer públicas sus trazas GPS en openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Descripción" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Por favor, introduzca la descripción sobre su traza" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Por favor, introduzca una etiqueta sobre su traza" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Traza seleccionada: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Conectando..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Subida cancelada" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Error al actualizar" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX subido correctamente" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Subida fallida. El servidor retorna el siguiente mensaje " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Subiendo traza GPX: {0}% ({1} de {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" "Ninguna descripción facilitada. Por favor, proporcione alguna descripción." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "No hay ninguna capa gpx seleccionada. No se puede subir la traza." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Ningún nombre de usuario facilitado." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Ninguna contraseña facilitada." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Subiendo traza GPX" @@ -8193,33 +9051,34 @@ msgstr "¡¡Uno de los archivos seleccionados era nulo!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Leyendo fotos..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Imposible obtener ruta apropiada para el directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Escaneando directorio {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Encontrado archivo nulo en el directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Error mientras se obtenían archivos del directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Correlacionar con GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8239,15 +9098,15 @@ msgstr "Archivos GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "El archivo {0} ya está cargado con el nombre \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Error mientras se analizaba sintácticamente {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8259,34 +9118,34 @@ "lee en la foto y seleccione una zona horaria
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Hora de la foto (desde exif)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Hora del Gps (leída desde la foto tomada): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/aaaa hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Yo estoy en la zona horaria de: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Sin fecha" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Abrir otra foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "sincronizar el tiempo de una foto con el receptor GPS" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8296,29 +9155,29 @@ "Por favor, utilice el formato requerido." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Fecha no válida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Traza GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Abrir otra traza gpx" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Zona horaria: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Ajuste:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8326,41 +9185,41 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Actualizar posición para: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Todas las imágenes" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Imágenes sin la posición exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Fotos no etiquetadas todavía" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Correlacionar las imágenes con la traza GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Correlación" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Estimación automática" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Debe seleccionar una traza GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "No se ha seleccionado una traza GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8371,9 +9230,9 @@ "Formato esperado: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Zona horaria no válida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8384,18 +9243,18 @@ "Formato esperado: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Desplazamiento inválido" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Traza GPX cargada" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" @@ -8403,9 +9262,9 @@ "fueron tomadas." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Las fotografías no contiene información horaria" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8414,39 +9273,39 @@ "seleccione otra." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "La traza GPX no posee información horaria" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Zona horaria: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minutos: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Segundos: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Ajustadas al track GPS {0} de {1} fotografías" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Diferencia horaria de {0} días)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8454,13 +9313,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Ajuste de fotografías a traza fallido" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Ajustar zona horaria y la diferencia temporal" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valores por defecto" @@ -8482,5 +9341,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Error al leer el archivo" @@ -8503,6 +9362,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: URL Ilegal." @@ -8690,22 +9549,22 @@ msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Descargando {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Contactando con servidor WMS..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Crear edificios" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8715,19 +9574,19 @@ "la importación de archivo está limitada a 1km2 como máximo." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" "Por favor, active el autoabastecimiento y compruebe el catastro Millesime." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Extraer SVG de la caja de vista..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Extaer el mejor ajuste de frontera..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Crear frontera" @@ -8846,6 +9705,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Capa en blanco" @@ -8874,5 +9733,5 @@ msgstr "Cuadro de la Comunna: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8883,14 +9742,14 @@ "Creado uno nuevo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Error en el formato caché" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Error en la zona Lambert de la caché" @@ -8981,4 +9840,9 @@ msgstr "No se puede duplicar una vía sin orden." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "No se han cargado los datos." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8989,9 +9853,9 @@ msgstr "Crear un duplicado de la vía" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Capa para la edición de trazas GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Convertir a capa GPX con tiempo anonimizado" @@ -9112,30 +9976,30 @@ msgstr "Eliminar los datos después de importarlos" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importando datos desde el dispositivo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importando datos desde DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Error al eliminar los datos." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Datos importados de {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "No se han encontrado datos en el dispositivo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Conexión fallida." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9147,14 +10011,14 @@ "josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Importar Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Importar datos del Globalsat Datalogger DG100 en la capa gpx" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importar" @@ -9245,40 +10109,40 @@ msgstr "Abrir imágenes con ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "No se encuentra la dirección indexada '{0}'" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "La localización inicial no está dentro de la bbox" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Buscando línea de costa..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} nodos hasta el momento..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Error al crear directorio caché: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Calco" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "Examinando cache..." @@ -9287,26 +10151,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Corriendo reducción de vértices..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Corriendo aproximación Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Eliminando nodos duplicados..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Traza Lakewalker" @@ -9391,7 +10247,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "lámina de agua" @@ -9548,9 +10404,9 @@ msgstr "Preferecnias de Lakewalker Plugin" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Descargando tesela de la imagen..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "No se a podido adquirir la imagen" @@ -9803,18 +10659,18 @@ msgstr "Estado de la cuestión desconocida" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Abrir visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Abrir solo archivos que sean visibles en la vista actual." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "No hay una vista abierta - No se pueden determinar los límites!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9841,34 +10697,34 @@ msgstr "Ejecutable Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "carga de datos desde el API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "cambiar la selección" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "modificar vista general" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "confirmar todas las acciones manuales de control remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" "Un componente que permite a JOSM ser controlado por otras aplicaciones." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Control Remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Ajustes para el componente Control Remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9880,28 +10736,28 @@ "comunicarse con el complemento." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Acciones permitidas" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "El control remoto ha pedido cagar datos desde el API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Detalles requeridos: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "¿Desea permitir esto?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "confirmar la acción del control remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "El control remoto ha pedido importar datos de la siguiente URL:" @@ -10030,5 +10886,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "imagen " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10166,4 +11022,25 @@ msgid "Highlight" msgstr "Resaltado" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Actualizar las propiedades de hasta {0} objeto" +msgstr[1] "Actualizar las propiedades de hasta {0} objetos" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10424,34 +11301,34 @@ "especifica" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Introduzca Lat/Lon para ir a la posición." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "También puedes pegar una dirección URL de www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (en metros)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Ir allí" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Salta a la posición" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Imposible analizar sintácticamente Lon/Lat" @@ -10485,6 +11362,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Validación de errores" @@ -10494,10 +11371,10 @@ msgstr "Sin validación de errores" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Rejilla" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10590,23 +11467,15 @@ msgstr "Realiza la validadción de datos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Datos con errores. ¿Aún así desea subirlos al servidor?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Abrir la ventana de validación" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoom al problema" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Validar" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Validar la selección actual o el conjunto de datos completado" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10679,22 +11548,22 @@ msgstr "Cruce de vías" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Nodos duplicados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Esta examen comprueba que no haya nodos en el mismo lugar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Nodos de la via duplicados." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Comprueba vías con nodos idénticos consecutivos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Nodos de la via duplicados" @@ -10774,9 +11643,9 @@ "escrito mal." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Comprobación de propiedades:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -10784,15 +11653,15 @@ "valores." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Línea de test de etiquetas no válida - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Línea de correción ortográfica no válida: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10803,7 +11672,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Combinaciones incorrectas de etiquetas y/o valores" @@ -10811,61 +11680,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problema al dibujar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Clave ''{0}'' no válida." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Etiquetas con valores vacíos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Clave de propiedad no válida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Espacio en blanco no válido en la clave de propiedad" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" "Los valores de la propiedad empiezan y terminan con un espacio en blanco" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Los valores de propiedad contienen entidad de HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "La clave ''{0}\" no existe en los predefinidos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Esta clave no está predefinida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Los predefinidos no contiene valores apropiados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Comprobar las propiedades de las claves" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -10873,19 +11742,21 @@ "comprobación de las palabras." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Usar analizador de propiedad compleja." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Validar valores de propiedad y etiquetas que usan reglas complejas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Fuente de test de etiquetas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10896,21 +11767,21 @@ "del corrector de etiquetas." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Agregar nueva fuente a la lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Editar la fuente seleccionada." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Fuentes de datos" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Analizar propiedades de los valores." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -10918,62 +11789,62 @@ "los predefinidos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Comprobar FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Buscar nodos o viales con FIXME en cualquier propiedad de valor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Compruebar el registro de notas." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Analizar si el mapa creado contiene errores en los datos." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Usar datos de archivo por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Usar datos de archivo por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "Ignorar el uso de etiquetas de archivos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "Utilizar etiquetas de archivos por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Utilizar el corrector ortográfico por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Utilizar el corrector ortográfico por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Fijar las propiedades" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "No se pudo encontrar el tipo de elemento" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "No se pudo encontrar el nivel de alerta" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Expresión ilegal ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11118,7 +11989,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "edificio" @@ -11132,5 +12003,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "área" @@ -11166,10 +12037,10 @@ msgstr "Conectado nodo de extremo de vía próximo a otro vial" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Nodos sin etiquetar y desconectados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11228,8 +12099,32 @@ "Línea terrestre invertida: la tierra no puede situarse al lado izquierdo" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11240,10 +12135,10 @@ msgstr "Seleccione un nodo de inicio en el extremo de la vía" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Extender al final de la línea" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Alcanzar una intersección" @@ -11292,14 +12187,14 @@ msgstr "Ayuda del componente WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Rectificar la imagen..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Descargar imagen rectificada desde varios servicios" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11310,26 +12205,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Personalizar enlace WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Servicios de rectificación soportados:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Visitar la web del programa" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "URL del WMS o ID de la imágen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Añadir imágen rectificada" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11337,5 +12232,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "URL o id de WMS no válida" @@ -11345,5 +12240,5 @@ msgstr "Ajustar la posición de la capa WMS seleccionada" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11355,19 +12250,19 @@ "Esto puede dar lugar a unas coordenadas erróneas." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Descarga automática" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Capa WMS ({0}), descargando en zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11376,58 +12271,58 @@ "o cambe la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" 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:337 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Preferencias del componente WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" @@ -11438,31 +12333,31 @@ "para añadirlo a la lista superior de servidores mostrados)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nombre del menú" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Dirección URL del servicio WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Nombre del menú (por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "Dirección URL del servicio WMS (Por defecto)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 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:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copiar por defecto" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Gestor de descarga:" @@ -11586,11 +12481,16 @@ "directamente en JOSM" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11604,10 +12504,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Ayuda a vectorizar imágenes WMS" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11617,5 +12517,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11628,5 +12528,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11640,10 +12540,10 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Muestra una imágen OpenLayers de fondo" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -11652,5 +12552,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11660,5 +12560,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11668,5 +12568,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11677,15 +12577,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "El gran JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Dejar que otras aplicaciones envíen comandos a JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11694,10 +12594,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamiento." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11708,10 +12608,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -11720,5 +12620,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11732,10 +12632,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Crea edificios entremedianeras a partir de bloques únicos" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11747,5 +12647,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11756,5 +12656,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11765,6 +12665,13 @@ "una corrector ortográfico para los nombres de las etiquetas." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -11772,5 +12679,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12927,58 +13834,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12992,6 +13847,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Autopista" @@ -13017,6 +13872,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "Carretera principal" @@ -13042,6 +13897,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "vía primaria" @@ -13067,6 +13922,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "vía secundaria" @@ -13080,5 +13935,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "carretera local" @@ -13096,5 +13951,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "calle urbana" @@ -13128,6 +13983,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "vía de servicio" @@ -13154,6 +14009,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "en construcción" @@ -13203,5 +14058,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rotonda" @@ -14181,5 +15036,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "marísma" @@ -15910,27 +16765,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "deporte" @@ -18776,7 +19631,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bicicleta" @@ -18846,7 +19701,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "pie" @@ -18872,5 +19727,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -19361,13 +20216,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "obsoleto" @@ -19409,5 +20264,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "caballo" @@ -19627,4 +20482,66 @@ msgstr "barrera" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Autovía" + #. color tertiary #. @@ -19659,6 +20576,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "calle" @@ -19714,7 +20631,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "pista" @@ -19770,8 +20687,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "ferrocarril" @@ -19792,5 +20709,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "servicios" @@ -19804,5 +20721,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "vado" @@ -19823,5 +20740,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "círculo de giro" @@ -19836,5 +20753,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "Punto de acceso de emergencias" @@ -19849,5 +20766,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "ribera" @@ -19861,5 +20778,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "arroyo" @@ -19873,5 +20790,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "muelle" @@ -19899,5 +20816,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "acueducto" @@ -20065,13 +20982,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "hecho por el hombre" @@ -20133,7 +21050,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "punto ferroviario" @@ -20156,10 +21073,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "otros ferrocarriles" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "paso con más de un cruce ferroviario" @@ -20195,7 +21112,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "vía muerta" @@ -20240,6 +21157,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "aerovía" @@ -20253,5 +21170,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20273,5 +21190,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "pista (oscuro)" @@ -20285,5 +21202,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "pista (claro)" @@ -20331,7 +21248,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "pista de rodadura" @@ -20348,5 +21265,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "pista fácil" @@ -20361,5 +21278,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "pista intermedia" @@ -20374,5 +21291,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "pista avanzada" @@ -20387,5 +21304,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "pista para expertos" @@ -20400,5 +21317,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "pista de estilo libre" @@ -20413,5 +21330,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "pista para iniciados" @@ -20516,10 +21433,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "energía" @@ -20533,5 +21450,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "muelle" @@ -20545,5 +21462,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "tubería" @@ -20671,12 +21588,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "ocio" @@ -20690,5 +21607,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "puerto deportivo" @@ -20760,8 +21677,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "servicios" @@ -20863,10 +21780,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "tráfico de ocio" @@ -21252,22 +22169,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "equipamiento lumínico" @@ -21299,6 +22216,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "agua (claro)" @@ -21359,8 +22276,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "salud" @@ -21713,26 +22630,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "tienda" @@ -21804,8 +22721,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21955,9 +22872,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turismo" @@ -22029,8 +22946,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "patrimonio histórico" @@ -22101,8 +23018,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "zona verde" @@ -22116,5 +23033,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "cantera" @@ -22128,5 +23045,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "vertedero" @@ -22148,5 +23065,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "cuenca" @@ -22160,5 +23077,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "plantación forestal" @@ -22172,5 +23089,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "edificio agrario" @@ -22193,5 +23110,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "venta al por menor" @@ -22205,5 +23122,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industrial" @@ -22217,5 +23134,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "área postindustrial degradada" @@ -22229,5 +23146,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "área rururbana" @@ -22241,5 +23158,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "zona ferroviaria" @@ -22296,7 +23213,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "zona militar" @@ -22310,5 +23227,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cementerio" @@ -22321,5 +23238,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "pico" @@ -22334,5 +23251,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "glaciar" @@ -22346,5 +23263,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "volcán" @@ -22399,8 +23316,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "espacio natural" @@ -22414,5 +23331,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "matorral" @@ -22426,5 +23343,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "monte" @@ -22438,5 +23355,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "bosque" @@ -22450,5 +23367,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "lodazal" @@ -22462,5 +23379,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "playa" @@ -22538,8 +23455,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "ruta" @@ -22587,7 +23504,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "frontera" @@ -22729,10 +23646,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "lugar" @@ -22780,6 +23697,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "dirección" @@ -23076,16 +23993,59 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Capa de datos" - -#~ msgid "Uploading data" -#~ msgstr "Subiendo datos" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "" +#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más " +#~ "tarde." + +#~ msgid "API initialization failed" +#~ msgstr "Fallo en la inicialización del API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de " +#~ "datos?" + +#~ msgid "No data" +#~ msgstr "Sin datos" + +#~ msgid "Update failed" +#~ msgstr "Actualización fallida" + +#~ msgid "Missing primitive" +#~ msgstr "Falta la primitiva" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Aplicar resolución parcial" + +#~ msgid "Layers: {0}" +#~ msgstr "Capas: {0}" + +#~ msgid "Conflict created" +#~ msgstr "Conflicto creado" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Eliminar el miembro en la fila de tabla actual de esta relación" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "El componente no pudo ser eliminado. Por favor informe del problema a los " +#~ "administradores de JOSM." + +#~ msgid "Validate" +#~ msgstr "Validar" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Validar la selección actual o el conjunto de datos completado" + +#~ msgid "Email" +#~ msgstr "Correo Electrónico" #~ msgid "Not implemented yet." #~ msgstr "No implementado aún." -#~ msgid "Email" -#~ msgstr "Correo Electrónico" - #~ msgid "Resolve Conflicts" #~ msgstr "Resolver conflictos" @@ -23094,6 +24054,54 @@ #~ msgstr "Existieron conflictos durante la importación" +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactando con el servidor OSM..." + +#~ msgid "their version:" +#~ msgstr "su versión:" + +#~ msgid "resolved version:" +#~ msgstr "versión resuelta:" + +#~ msgid "my version:" +#~ msgstr "mi versión:" + #~ msgid "Object" #~ msgstr "Objeto" + +#~ msgid "position" +#~ msgstr "posición" + +#~ msgid "different" +#~ msgstr "diferente" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "true" +#~ msgstr "verdadero" + +#~ msgid "unnamed" +#~ msgstr "sin nombre" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Validar nombre (correo-e) de la cuenta OSM" + +#~ msgid "Aborting..." +#~ msgstr "Abortando..." + +#~ msgid "Change" +#~ msgstr "Modificar" + +#~ msgid "OSM username (email)" +#~ msgstr "Nombre de usuario OSM (correo electrónico)" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "El complemento requiere actualizar JOSM: {0}." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):" + +#~ msgid "Charge" +#~ msgstr "Pago" #~ msgid "{0} object has conflicts:" @@ -23101,95 +24109,4 @@ #~ msgstr[0] "el objeto {0} tiene conflictos" #~ msgstr[1] "los objetos {0} tienen conflictos" - -#~ msgid "my version:" -#~ msgstr "mi versión:" - -#~ msgid "their version:" -#~ msgstr "su versión:" - -#~ msgid "resolved version:" -#~ msgstr "versión resuelta:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Validar nombre (correo-e) de la cuenta OSM" - -#~ msgid "OSM username (email)" -#~ msgstr "Nombre de usuario OSM (correo electrónico)" - -#~ msgid "Unknown host" -#~ msgstr "Host desconocido" - -#~ msgid "position" -#~ msgstr "posición" - -#~ msgid "different" -#~ msgstr "diferente" - -#~ msgid "true" -#~ msgstr "verdadero" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Resolver conflictos {0} en objetos {1}" - -#~ msgid "Change" -#~ msgstr "Modificar" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "clique Recargar para refrescar la lista" - -#~ msgid "Revert" -#~ msgstr "Revertir" - -#~ msgid "Date" -#~ msgstr "Fecha" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Revertir el estado de todos los objetos actualmente seleccionados a la " -#~ "versión escogida de la lista del historial" - -#~ msgid "Rotate" -#~ msgstr "Rotar" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etiquetas (un valor nulo borra la etiqueta)" - -#~ msgid "Error parsing server response." -#~ msgstr "Error analizando la respuesta del servidor" - -#~ msgid "Cannot connect to server." -#~ msgstr "No se puede conectar con el servidor" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y " -#~ "desplazamiento" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Añadir site-josm.xml o bien Páginas Wiki" - -#~ msgid "Tagging preset source" -#~ msgstr "Fuente de etiquetas preestablecidas" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista." - -#~ msgid "Tagging preset sources" -#~ msgstr "Fuentes de etiquetas preestablecidas" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "El servidor devolvió un error interno. Reduzca el área o reinténtelo más " -#~ "tarde." - -#~ msgid "Commit comment" -#~ msgstr "Envíe comentario" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -23205,9 +24122,118 @@ #~ msgstr "No se ha podido bajar el complemento: {0} al {1}" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Resolver conflictos {0} en objetos {1}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "El servidor devolvió un error interno. Reduzca el área o reinténtelo más " +#~ "tarde." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etiquetas (un valor nulo borra la etiqueta)" + +#~ msgid "Occupied By" +#~ msgstr "Ocupado por" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Añadir todos los objetos" + +#~ msgid "Add Selected" +#~ msgstr "Añadir seleccionado" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "clique Recargar para refrescar la lista" + +#~ msgid "Cannot connect to server." +#~ msgstr "No se puede conectar con el servidor" + +#~ msgid "Error parsing server response." +#~ msgstr "Error analizando la respuesta del servidor" + +#~ msgid "Revert" +#~ msgstr "Revertir" + +#~ msgid "Commit comment" +#~ msgstr "Envíe comentario" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Revertir el estado de todos los objetos actualmente seleccionados a la " +#~ "versión escogida de la lista del historial" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Añadir site-josm.xml o bien Páginas Wiki" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error al borrar el archivo del complemento: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Ya existe el complemento." + +#~ msgid "Date" +#~ msgstr "Fecha" + +#~ msgid "Drawbridge" +#~ msgstr "Puente levadizo" + +#~ msgid "Rotate" +#~ msgstr "Rotar" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Algunos nodos están (casi) en la línea" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y " +#~ "desplazamiento" + +#~ msgid "Tagging preset source" +#~ msgstr "Fuente de etiquetas preestablecidas" + +#~ msgid "Tagging preset sources" +#~ msgstr "Fuentes de etiquetas preestablecidas" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista." + +#~ msgid "Server does not support changesets" +#~ msgstr "El servidor no soporta conjuntos de cambios" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + #~ msgid "Navigation" #~ msgstr "Navegación" +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Ajustar la posición de la capa WMS" + #~ msgid "image not loaded" #~ msgstr "la imagen no se carga" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importar archivo TCX como traza GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Importar archivo TCX" #~ msgid "" @@ -23217,64 +24243,4 @@ #~ "Zoom: Rueda del ratón o doble click. Mover el mapa: mantenga apretado el " #~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Id de la imagen rectificada de Metacarta" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectificar id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Ajustar la posición de la capa WMS" - -#~ msgid "Charge" -#~ msgstr "Pago" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "El servidor no soporta conjuntos de cambios" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "El complemento requiere actualizar JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Ya existe el complemento." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error al borrar el archivo del complemento: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Algunos nodos están (casi) en la línea" - -#~ msgid "Drawbridge" -#~ msgstr "Puente levadizo" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Importar archivo TCX" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importar archivo TCX como traza GPS" #~ msgid "" @@ -23296,6 +24262,86 @@ #~ "para ver ayuda." +#~ msgid "Portcullis" +#~ msgstr "Rastrillo" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id de la imagen rectificada de Metacarta" + #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "El complemento {0} parece roto o no se ha podido bajar de forma " +#~ "automática." + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "La proyección {0} se ha diseñado \n" +#~ "solamente para latitudes entre 46.1° y 57°.\n" +#~ "Use otro sistema de proyección si no usa\n" +#~ "un servidor WMS francés.\n" +#~ "No suba ningún dato después de este mensaje." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la " +#~ "versión actual borrando el archivo existente?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Conflictos: {0}" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática" + +#~ msgid "viaduct" +#~ msgstr "viaducto" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n" + +#~ msgid "Remove Selected" +#~ msgstr "Eliminar seleccionados" + +#~ msgid "Basic" +#~ msgstr "Básico" + +#~ msgid "Delete and Download" +#~ msgstr "Eliminar y descargar" + +#~ msgid "Move Down" +#~ msgstr "Mueve hacia abajo" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor de relación: {0}" + +#~ msgid "Move Up" +#~ msgstr "Mover hacia arriba" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Esta acción requiere de {0} solicitudes individuales de descargas. ¿Desea " +#~ "continuar?" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Ninguna intersección encontrada. No se han producido cambios." + +#~ msgid "rectifier id={0}" +#~ msgstr "rectificar id={0}" #~ msgid "" @@ -23352,78 +24398,4 @@ #~ "utilice." -#~ msgid "Portcullis" -#~ msgstr "Rastrillo" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "El complemento {0} parece roto o no se ha podido bajar de forma " -#~ "automática." - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "La proyección {0} se ha diseñado \n" -#~ "solamente para latitudes entre 46.1° y 57°.\n" -#~ "Use otro sistema de proyección si no usa\n" -#~ "un servidor WMS francés.\n" -#~ "No suba ningún dato después de este mensaje." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la " -#~ "versión actual borrando el archivo existente?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflictos: {0}" - -#~ msgid "viaduct" -#~ msgstr "viaducto" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática" - -#~ msgid "sports" -#~ msgstr "Deportes" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Zona Lambert {0} en la caché incompatible con la zona Lambert actual {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Eliminar y descargar" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Ninguna intersección encontrada. No se han producido cambios." - -#~ msgid "Solve Conflict" -#~ msgstr "Resolver conflicto" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos " -#~ "previamente enviados tienen historial." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Esta acción requiere de {0} solicitudes individuales de descargas. ¿Desea " -#~ "continuar?" - #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -23434,22 +24406,29 @@ #~ "coincidirlos.\"" +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Zona Lambert {0} en la caché incompatible con la zona Lambert actual {1}" + +#~ msgid "sports" +#~ msgstr "Deportes" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Editar un puente levadizo" + +#~ msgid "Edit Portcullis" +#~ msgstr "Editar rastrillo" + #~ msgid "The following errors occured during mass download:" #~ msgstr "Se han producido los siguientes errores durante la descarga masiva:" -#~ msgid "Edit Drawbridge" -#~ msgstr "Editar un puente levadizo" - -#~ msgid "Edit Portcullis" -#~ msgstr "Editar rastrillo" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Página de ayuda perdida. Crearla en english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Página de ayuda perdida. Crearla en english or spanish." +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Start routing" +#~ msgstr "Iniciar enrutamiento" + +#~ msgid "Remove route nodes" +#~ msgstr "Eliminar nodos de ruta" #~ msgid "Directly load TCX files from JOSM." @@ -23466,9 +24445,28 @@ #~ "interesantes." -#~ msgid "Remove route nodes" -#~ msgstr "Eliminar nodos de ruta" - -#~ msgid "Start routing" -#~ msgstr "Iniciar enrutamiento" +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Página de ayuda perdida. Crearla en english." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Página de ayuda perdida. Crearla en english or spanish." + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "No se puede leer el valor numérico de la respuesta" + +#~ msgid "% of lat:" +#~ msgstr "% de lat:" + +#~ msgid "% of lon:" +#~ msgstr "% de lon:" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida." + +#~ msgid "linked" +#~ msgstr "enlazado" #~ msgid "" @@ -23487,39 +24485,31 @@ #~ "No suba ningún dato tras haber leido este mensaje." -#~ msgid "Cannot read numeric value from response" -#~ msgstr "No se puede leer el valor numérico de la respuesta" - #~ msgid "Data upload failed for unknown reason" #~ msgstr "La subida de datos ha fallado por una razón desconocida" -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida." - #~ msgid "Overlap tiles" #~ msgstr "Teselas superpuestas" -#~ msgid "% of lat:" -#~ msgstr "% de lat:" - -#~ msgid "% of lon:" -#~ msgstr "% de lon:" +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos " +#~ "previamente enviados tienen historial." #~ msgid "Undeleting Way..." #~ msgstr "Deshaciendo borrado de vía..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Comprobando si falta el nodo {0}..." - #~ msgid "Undeleting relation..." #~ msgstr "Deshaciando borrado de relación..." +#~ msgid "Selection too big" +#~ msgstr "Selección demasiado grande" + +#~ msgid "Keep mine" +#~ msgstr "Mantaner lo mío" + #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Comprobando si falta el primitivo {0}..." - -#~ msgid "Keep mine" -#~ msgstr "Mantaner lo mío" - -#~ msgid "Delete mine" -#~ msgstr "Borrar lo mío" #~ msgid "" @@ -23538,4 +24528,10 @@ #~ "{3} para cancelar.
" +#~ msgid "Delete mine" +#~ msgstr "Borrar lo mío" + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Comprobando si falta el nodo {0}..." + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -23547,6 +24543,18 @@ #~ "de {1} primitivos." -#~ msgid "Selection too big" -#~ msgstr "Selección demasiado grande" +#~ msgid "Data Layer" +#~ msgstr "Capa de datos" + +#~ msgid "WGS84 Geographisch" +#~ msgstr "WGS84 Geográfico" + +#~ msgid "Sort" +#~ msgstr "Ordenar" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Ordenar los miembros de la relación seleccionada o toda la lista" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Miembros: {0} (enlazados: {1})" #~ msgid "image loading..." Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 16826) +++ /applications/editors/josm/i18n/po/et.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:33+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-29 21:28+0000\n" "Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Loon kasutajaliidest" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Salvestamata muudatused" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "On salvestamata muudatusi. Tühista muudatused ja jätka?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Salvesta ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Tühista ja välju" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Katkesta" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Hoiatus" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "TUNDMATU" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Näita info akent." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versioon {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Viimane muudatus {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java versioon {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Koduleht" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Vigadest teatamine" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Teave" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Loemind" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisjon" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Panus" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Litsents" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Pistikud" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "JOSM -i kohta ..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Faili ei leitud" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Hoiatus" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Palun vali rida kustutamiseks" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Vali miski:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Liida sõlmed." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Lisa märkus..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "Toimeta {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Lisa koordinaadid uuele sõlmele." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Kasuta kraade kümnendsüsteemis." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Laiuskraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Pikkuskraad" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Paiguta sõlmed ringikujuliselt." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Liiguta valitud sõlmed ringiks." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,45 +489,70 @@ msgstr "Tööriist {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Palun vali vähemalt neli sõlme." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Paiguta sõlmed ühele joonele." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Liiguta valitud sõlmed ühele joonele." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Palun vali vähemalt kolm sõlme." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" "Current number of changes exceeds the max. number of changes, current is " "{0}, max is {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +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 msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "API initsialiseerimine ebaõnnestus" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +msgstr "API võimaluste rikkumine" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +568,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Eeltingimuste rikkumine" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "andmed" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "kiht" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "valik" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "allalaetule" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Suumi {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Suumi vaade {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +617,30 @@ msgstr "Vaade: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Ei ole valitud midagi, millele suumida" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Palun vali vähemalt kaks teed, mida sobitada." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Sobita erinevate kuuluvustega teed?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -457,13 +649,13 @@ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Sobita ikkagi." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Muuda suundi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -473,10 +665,10 @@ "pöörata?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Pööra ja sobita." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -484,20 +676,20 @@ msgstr "Sisesta kõigi vastuolude kohta väärtused." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Lahenda vastuolud." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Ühenda {0} teed." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Kõik teed olid tühjad." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -514,23 +706,24 @@ msgstr "Kopeeri valitud objektid puhvrisse." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Palun vali kopeerimiseks mõni objekt." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Moodusta ring" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Moodusta valitud kolmest sõlmest ring." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Need sõlmed ei ole ringis." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -538,87 +731,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Kustuta" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Kustuta valitud objektid." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Ülekirjutamine" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Jaga sõlmed." -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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-ist..." - -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +msgstr "Lae OSM serverist..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Lae kaardi andmed OSM serverist" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Fail: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Lae alla" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Palun vali allalaadimiseks vähemalt üks toiming." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Impordi ajal leidis aset {0} konflikti." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Viga allaladimise ajal" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Kahekordista" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Kahekordista ja kleebi valitud objekt." @@ -638,5 +866,5 @@ msgstr "Rakenduse sulgemine." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -644,58 +872,73 @@ msgstr "Märkus: GPL ei ole OSM litsentsiga ühilduv. Ära lae GPL jälgi üles." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Ekspordi GPX-i..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Ekspordi andmed GPX faili." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Midagi ei ole eksportida." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" -msgstr "gps jälje kirjeldus" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +msgstr "GPS jälje kirjeldus" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Lisa autori informatsioon" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Tegelik nimi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-post" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Autoriõigus (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Eelseadistatud" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Autoriõiguse aasta" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Võtmesõnad" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Ekspordi suvandid" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Ekspordi ja salvesta" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -706,25 +949,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Viga" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Vali eeldefineeritud litsents" @@ -734,46 +957,49 @@ msgstr "JOSM võrguabi" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Ava sirvikus" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Muuda" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Lae uuesti" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Viga lehekülje {0} laadimisel." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -789,5 +1015,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide ajaloo kohta." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 @@ -798,5 +1024,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -809,30 +1035,40 @@ msgstr "Ühenda sõlm lähima teega." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Ühenda sõlm ja joon." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Ei ole shortcuti." +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Liida igal juhul." + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Ühenda kiht otse all valitud kihti." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -840,68 +1076,79 @@ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Liida igal juhul." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Sulanda {0} sõlm(e)" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "valik" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Ei ole valitud primitiive mida uuendada." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Peegelda" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Peegelda valitud sõlmed ja teed." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Palun vali vähemalt üks sõlm või tee." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "Üles" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Liiguta objektid {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "Alla" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "Vasakule" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "Paremale" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Liiguta {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Liiguta objektid {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objekte ei saa maailmast välja viia" @@ -909,5 +1156,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Uus" @@ -917,26 +1164,17 @@ msgstr "Loo uus kaart." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "Nimetu" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Ava..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Faili avamine." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ei suutnud lugeda \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -965,34 +1203,35 @@ msgstr "Allalaadimise URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Muuda kujund ortogonaalseks." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Ainult kaks sõlme lubatud." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Valik peab koosnema ainult kahest sõlmest." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Palun vali peaaegu täisnurga all kohtuvad teed." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Sa kasutad EPSG:4326 projektsiooni, mis võib viia
soovimatute " @@ -1000,9 +1239,9 @@ "vabanemiseks muuda oma projektsiooni.
Kas jätkame?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Ainult üks sõlm valitud." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ristkülikusta." @@ -1018,11 +1257,11 @@ msgstr "Kleebi puhvri sisu." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Kleebi sildid." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid." @@ -1050,16 +1289,21 @@ msgstr "Tee uuesti viimane tagasivõtmine" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Nimeta kiht ümber." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Nimeta fail ka ümber." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Ei saa faili {0} ümber nimetada." @@ -1073,9 +1317,9 @@ msgstr "Pööra kõigi valitud teede suund." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Palun vali vähemalt üks tee." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Pööra teede suund." @@ -1083,17 +1327,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Salvesta" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Salvesta praegused andmed" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Fail {0} on juba olemas. Kas kirjutan üle?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1103,25 +1349,25 @@ "sellest veast arendajaid." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tühi dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokumendis ei ole andmeid." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Salvesta ikkagi." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konfliktid" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1131,54 +1377,75 @@ "tagasi. Jätkame?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Lahenda vastuolud ja salvesta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Salvesta OSM fail." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Salvesta GPX fail" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Salvesta kiht" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Ei saa faili varundada." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Tundmatu faililaiend: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Salvestamisel ilmnes viga." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Varundatud faili taastamisel ilmnes viga" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Tundmatu faililaiend." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Salvestamisel ilmnes viga." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Varundatud faili taastamisel ilmnes viga" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Salvesta nimega..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Salvesta need andmed uude faili." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Vali kõik." -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1210,16 +1477,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Sulge" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Lahuta tee." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Lahuta tee valitud sõlme kohalt." @@ -1229,5 +1496,5 @@ msgstr "Valik ei ole lahutamiseks sobiv." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1235,5 +1502,5 @@ msgstr[1] "Valitud sõlmed ei ole tee keskel." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1249,9 +1516,9 @@ "sõlmed kuuluvad" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Valitud sõlmed ei ole samast teest." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1259,10 +1526,10 @@ msgstr[1] "Valitud tee ei sisalda valitud sõlmi" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1272,21 +1539,23 @@ "middle of the way.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Rollipõhised seosed kopeeriti uutele teedele.\n" "Vaata need igaks juhuks üle." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Relatsiooni liikmelisus kopeeriti kõikidele uutele teedele.\n" "Seda tuleb kontrollida ning vajadused viia sisse parandused." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1307,47 +1576,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "See on üksik sõlm." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Ükski neist sõlmedest ei ole millegi küljes." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Seda valikut ei ole võimalik uuestiliitmiseks kasutada." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Vali miski:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* üks sildiga sõlm või" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1356,5 +1625,5 @@ "teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1363,5 +1632,5 @@ "ühes neist teedest" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1374,9 +1643,9 @@ "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Lahtisulatatud sõlm" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1384,5 +1653,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1398,141 +1667,89 @@ msgstr "Tühista eelmine tegevus" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Tühista kõik valikud" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Tühista kõigi objektide valikud" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Tühista kõik valikud (fookus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Tühista kõik valikud (page)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Uuenda andmed" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)." -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed " -"laaditud?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Valitud primitiivide uuendamine ebaõnnestus." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Puuduv primitiiv" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "Uuenda valik" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Ei ole valitud primitiive mida uuendada." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Tühi valik" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Lae OSMi serverisse" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Lae kõik muudatused OSM serverisse üles." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objektid lisada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objektid muuta:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objektid kustutada:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Kas laen need muudatused üles?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Lae muudatused üles" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Lahendamata konfliktid! Sa pead need enne lahendama." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Pole muudatusi mida üles laadida." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Üleslaadimine" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Primitiivi uuendamine" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +msgstr "Sünkroniseeri ainult {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +msgstr "Sünkroniseeri kogu andmekogu" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1546,17 +1763,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Avastatud konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1567,54 +1784,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Eelitingimuste rikkumine" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitiiv on juba kustutatud" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Laadimine OSM API-le ebaõnnestus" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Primitiivi uuendamine" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Lae kõik muudatused OSM serverisse üles." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objektid lisada:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objektid muuta:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1702,42 +1930,54 @@ msgstr "Aeglasemalt edasi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "GPS andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Alla laetud GPX andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Toored GPS andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Andmeid ei imporditud." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Openstreetmapi andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Laen alla {0} {1}-st ({2} veel)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Andmete üles laadimine" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Viga allaladimise ajal" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1749,21 +1989,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Kustutatud või nihutatud primitiivid" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Kustutusrežiim" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Kustuta sõlmi või teid" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1771,5 +2011,5 @@ msgstr "Režiim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1777,733 +2017,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Joonistamine" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Sõlmede joonistamine" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "valitud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Lisa punkt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Lisa teele sõlm" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Ühenda olemasolev tee sõlmega" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Lisa sõlm teele ja ühenda" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Loo uus sõlm." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Vali kursori all olev sõlm." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Lisa teele uus sõlm." -msgstr[1] "Lisa {0} teele uus sõlm." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Alusta uut teed viimasest sõlmest." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Jätke teed viimasest sõlmest." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Lõpeta joonistamine." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Alade loomine" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Vali" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Mastaap" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Suumi ja liiguta kaarti" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Otsi..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Otsi objekte." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Andmeid ei laetud." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Palun sisesta otsingu tekst" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "asenda valik" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "lisa valikusse" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "eemalda valikust" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "tõstutundlik" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regulaaravaldis" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Otsi" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Alusta otsingut" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "Leitus {0} vastet" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Allalaadimine..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objektid" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Kustuta {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Kustuta {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Konfliktne relatsioon" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Liiguta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "punkt" -msgstr[1] "punktid" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Ei suuda avada eelistuste kataloogi: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2515,7 +2045,771 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Joonistamine" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Sõlmede joonistamine" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "valitud" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Lisa punkt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Lisa teele sõlm" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Ühenda olemasolev tee sõlmega" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Lisa sõlm teele ja ühenda" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Loo uus sõlm." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Vali kursori all olev sõlm." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Lisa teele uus sõlm." +msgstr[1] "Lisa {0} teele uus sõlm." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Alusta uut teed viimasest sõlmest." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Jätke teed viimasest sõlmest." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Lõpeta joonistamine." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Alade loomine" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Joonista soovitud suurusega ristkülik ning vabasta seejärel hiire nupp." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Pööramise lõpetamiseks vabasta hiire nupp." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Vali" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Mastaap" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Suumi ja liiguta kaarti" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Otsi..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Otsi objekte." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Palun sisesta otsingu tekst" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "asenda valik" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "lisa valikusse" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "eemalda valikust" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "tõstutundlik" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regulaaravaldis" + +#: ../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:95 +msgid "name:Bak - 'Bak' anywhere in the name." +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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +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 +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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Otsi" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Alusta otsingut" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "Leitud {0} vastet" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Lae valik" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Allalaadimine..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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/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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objektid" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Lahenda vastuolud." + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, java-format +msgid "Add conflict for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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:584 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Kustuda seadeid" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Liiguta" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "punkt" +msgstr[1] "punktid" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2544,5 +2838,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2551,27 +2845,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2579,13 +2873,13 @@ msgstr[1] "teed" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2593,22 +2887,22 @@ msgstr[1] "seosed" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2622,23 +2916,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2693,5 +2987,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2829,9 +3123,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2848,5 +3137,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "taust" @@ -2857,8 +3146,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2869,5 +3158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "" @@ -2890,22 +3179,126 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Ei suutnud lugeda järjehoidjaid" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Ei suutnud salvestada järjehoidjat" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Rohkem ei näidata" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Eelitingimuste rikkumine" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "tundmatu" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Ootamatu erandolukord" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Tundmatu host" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Päeva sõnum pole saadaval" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Laen alla \"päeva sõnumit\"" @@ -2928,5 +3321,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." -msgstr "Kasutaja nimi" +msgstr "Kasutajanimi" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 @@ -2986,62 +3379,57 @@ msgstr "Salasõna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3049,51 +3437,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Fail" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Tööriistad" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Eelseaded" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3101,21 +3489,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Lülita joonvõrgu vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Täisekraan" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Heli" @@ -3159,61 +3547,76 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "kiht ei ole nimekirjas" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Ühendun OSM serveriga" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Viga parsimisel" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 msgid "false: the property is explicitly switched off" -msgstr "vale: omadus on selgesõnaliselt välja lülitatud" +msgstr "väär: omadus on selgesõnaliselt välja lülitatud" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91 msgid "true: the property is explicitly switched on" -msgstr "tõde: omadus on selgesõnaliselt sisse lülitatud" +msgstr "tõene: omadus on selgesõnaliselt sisse lülitatud" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96 @@ -3227,4 +3630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "" @@ -3256,20 +3660,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3277,47 +3681,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Liikmed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3325,25 +3729,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3380,5 +3784,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3389,5 +3793,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3401,5 +3805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3474,7 +3878,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3548,14 +3951,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3584,10 +3987,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3596,19 +3999,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3617,9 +4020,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3629,13 +4032,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3643,90 +4046,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3736,5 +4139,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3759,12 +4162,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3809,10 +4211,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3821,10 +4223,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3833,5 +4235,5 @@ msgstr "Väärtus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3891,9 +4293,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3901,5 +4303,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3929,6 +4331,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -3936,36 +4338,53 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Salvesta ikkagi." + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Lahenda konfliktid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3983,96 +4402,129 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Kihid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Ava kõikide laetud kihtide nimekiri." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Kustuta valitud kiht" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "On salvestamata muutusi. Kustutan kihi ikkagi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Kas sa tõesti tahad kogu kihti kustutada?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Info" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "Märkus" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Kustuta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Kustuta {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Näita/Peida" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Muuda valitud kihi nähtavust." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Näita/Peida Tekst/Ikoonid" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Muuda markertekstide ja ikoonide nähtavust." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Kihid" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Ava kõikide laetud kihtide nimekiri." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "Riik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Kustuta valitud kiht" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Ühenda kiht otse all valitud kihti." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Liiguta valitud kiht ühe rea võrra alla." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Ühenda kiht otse all valitud kihti." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Kihid: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Rohkem teavet sellest funktsioonist" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4081,22 +4533,28 @@ msgstr[1] "See muudab kuni {0} objekti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Tühi väärtus kustutab võtme." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Muuta väärtusi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4105,84 +4563,89 @@ msgstr[1] "Muuda kuni {0} objekti seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Palun vali võti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Palun vali väärtus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Palun vali objektid mille seadeid soovid muuta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Seaded/Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Valitud objektide seaded" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Muuda seost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Tõesti soovid kustutada valikut seosest {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Lisa seaded" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lisa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" -msgstr "Muuda seadei" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +msgstr "Seadete muutmine" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 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:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Kustuda seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Kustuta valitud võti kõkides objektides" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Seaded: {0} / Liikmelisus: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Seaded / Liikmelisus" @@ -4191,63 +4654,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Seosed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Ava kõikide seoste nimekiri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Seosed: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Ava toimetajas valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Kustuta valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Loo uus seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Seosed: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Ava toimetajas valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Kustuta valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Praegune valik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Ava valiku nimekirja aken." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Suurenda valitud elementidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Värskenda valikute nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Suurenda valikule" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Valik: Suhted:{0} / Teed:{1} / Punktid:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Valik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4256,5 +4721,5 @@ msgstr[1] "{0} teed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4263,5 +4728,5 @@ msgstr[1] "{0} seosed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4272,5 +4737,10 @@ msgstr "Lase paneel vabaks" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4278,143 +4748,409 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autorid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Ava valitud objektiga töötavate inimeste nimekiri." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objekti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autorid: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -msgid "Apply Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Lihtne" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Kasutab" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Allalaetav ala" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Kustuta valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Allalaadimise asukoht" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Konfliktid andmetes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Seosed" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Andmete allalaadimine" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Seosed" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Tee uuesti viimane tagasivõtmine" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Valitud primitiivide uuendamine ebaõnnestus." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Lisa valitud" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Lisa kõik hetkel valitud objektid liikmetena" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Eemalda valitud" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Eemalda kõik hetkel valitud objektid seosest" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Eemalda kõik hetkel valitud objektid seosest" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Kustuta valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konfliktid andmetes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Salvesta praegused andmed" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Suumi välja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Liiguta hetkel valitud liiget allapoole" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Lae valik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4424,5 +5160,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4432,25 +5168,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Järjehoidjad" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Palun sisesta enne soovitud kordinaadid." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Palun sisesta koha nimi." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "lisa valikusse" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Vali enne järjehoidja." @@ -4484,34 +5217,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Andme allikad ja tüübid" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Lae alla uue kihina" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Allalaetav ala" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Allalaetav ala liiga suur; server arvatavasti keeldub" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Allalaetav ala paras, suurus serverile tõenäoliselt sobiv" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Palun sisesta otsingutekst" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Ei saa lugeda kohaotsingu tulemusi serverist" @@ -4519,5 +5252,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Sisesta otsitava koha nimi:" @@ -4525,5 +5258,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4531,6 +5264,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nimi" @@ -4569,6 +5302,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4591,15 +5324,15 @@ msgstr "tüüp" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "lähedal" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "suurendus" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4608,5 +5341,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4638,5 +5371,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5378,5 +6117,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5543,59 +6282,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5603,138 +6342,128 @@ msgstr[1] "pildid" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sünkroniseeri kell" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Pilt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Kohanda värvi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Vaikimisi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Vali värv" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Heli import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Piltide import" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5743,5 +6472,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5750,5 +6479,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5757,30 +6486,30 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Muuda andme kihiks" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5790,43 +6519,43 @@ "kahjulikuks.
Kui soovite üles laadida radasid, vaata siia:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Muudetud sellest: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5835,9 +6564,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5845,5 +6574,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5851,47 +6580,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} kustutatud.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5916,5 +6645,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5922,5 +6651,5 @@ msgstr[1] "punktid" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5929,5 +6658,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5936,5 +6665,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5953,5 +6682,5 @@ msgstr[1] "markerid" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5960,29 +6689,29 @@ msgstr[1] "{0} koosneb {1} markerist" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sünkroniseeri heli" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Heli sünkroniseeritud punktis {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Ei saa sükroniseerida kihis mis mängib." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Loo heli marker mängimise alguses" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5990,10 +6719,17 @@ msgstr "Pane heli pausile punktis kuhu sa soovid markerit." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Pole heli markerit millest nihutada." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Näita/Peida Tekst/Ikoonid" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Muuda markertekstide ja ikoonide nähtavust." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6001,5 +6737,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6009,29 +6745,29 @@ "rajapuhktile kuhu sa soovid sünkroniseerida" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Ei saa uut heli markerit luua." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" -msgstr "Tekkis viga kui prooviti kuvada selel markeri URL''i" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +msgstr "Tekkis viga kui prooviti kuvada selle markeri URL" + +#: ../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:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" -msgstr "Viga URL''i kuvamisel" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +msgstr "Viga URL kuvamisel" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6039,26 +6775,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "PAlun vali rida muutmiseks" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6066,14 +6802,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Palun vali rida kustutamiseks" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "" @@ -6196,40 +6932,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Värv" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Vali" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Värvid" @@ -6557,46 +7293,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Uuenda" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "sümboolne kirjeldus" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Vaateseadistused" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6604,29 +7349,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Ühenduse sätted" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Kaardi seaded" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama." @@ -6727,59 +7472,61 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6945,33 +7692,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Rohkem teavet sellest funktsioonist" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Valikulised tunnused:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Kasuta eelseadet \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "suletud tee" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6982,15 +7729,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7000,18 +7747,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Muuda seadeid" @@ -7022,33 +7769,36 @@ msgstr "Eelseadete grupp \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Ühendun OSM serveriga..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Laen alla punkte alates {0} kuni {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Laen alla OSM andmeid..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Valmistan andmeid ette..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ei suutnud lugeda \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7056,21 +7806,21 @@ msgstr "GPX failid" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markerid {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7086,10 +7836,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7097,48 +7866,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 failid" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Koordinaadid imporditud: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Vigaselt vormindatud laused: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Kontrollsumma vead: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Tundmatud laused: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Null koordinaadid: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA import oli edukas." -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA impordi viga!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7147,15 +7915,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7163,23 +7931,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Avan muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Üleslaadimine..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, java-format +msgid "Starting retry {0} of {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7222,9 +8003,4 @@ msgid "Login" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Katkestan..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7275,66 +8051,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Viga sõelumisel." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM serveri failid" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Tundmatu versioon" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." -msgstr "Leidsin elemendi mitte-tees." - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +msgstr " element võib olla vaid way-s." + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " ei oma ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Leidub element, mis ei ole seotud" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Puudulik määratlus ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" -msgstr "Illegaalne objekt numbriga id=0" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +msgstr "Keelatud objekti number id=0" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7342,51 +8122,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Puudub vajalik atribuut \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Valmistan ette OSM andmeid..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Ühendun serveriga..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7395,16 +8208,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Uuenda pistikuid" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7421,5 +8229,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7428,23 +8236,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7455,32 +8263,30 @@ msgstr "Pistikus {0} tekkis viga" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, 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 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7488,21 +8294,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7510,5 +8316,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7516,19 +8322,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7536,25 +8342,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Info" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Pluginate infot ei leitud" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "kirjeldust pole saadaval" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7563,13 +8367,18 @@ msgstr[1] "Laadisin alla pluginate info {0} saidilt" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Pluginate infot ei leitud" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Kõik installeeritud pluginad on uuendatud." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7582,9 +8391,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Lae alla puuduvad pluginad" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7597,57 +8406,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "tundmatu" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versioon {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin kaasatud JOSMi" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "See jääb peale lindistuse lõppu" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Viga heili esitamisel" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ära tee midagi" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" -msgstr "Teata veast." - -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +msgstr "Teata veast" + +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7657,18 +8444,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Ootamatu erandolukord" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Palun teata piletiga {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7678,17 +8465,33 @@ "teatamist." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Lisa kindlasti järgnev info:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Tekst on juba kopeeritud clipboardi.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Rohkem ei näidata" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7701,5 +8504,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7709,5 +8512,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7718,13 +8521,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Vihje: Kiirkorraldusi saad muuta seadete alt..)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7732,21 +8550,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7754,74 +8572,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7887,33 +8706,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7933,15 +8753,15 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Viga {0} parsimisel" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7950,34 +8770,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7985,69 +8805,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8056,9 +8876,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8067,65 +8887,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8133,13 +8953,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8161,5 +8981,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -8182,6 +9002,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8345,22 +9165,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8368,18 +9188,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8492,6 +9312,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "" @@ -8520,5 +9340,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8527,14 +9347,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8622,4 +9442,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Andmeid ei laetud." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8630,9 +9455,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8753,30 +9578,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8785,14 +9610,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -8883,40 +9708,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -8925,26 +9750,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9029,7 +9846,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "" @@ -9174,9 +9991,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9416,18 +10233,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9452,33 +10269,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9487,28 +10304,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9772,4 +10589,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10016,33 +10854,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10076,6 +10914,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10085,10 +10923,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10175,22 +11013,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." msgstr "" @@ -10262,22 +11092,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10350,23 +11180,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10375,7 +11205,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10383,78 +11213,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10462,82 +11294,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10682,7 +11514,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "" @@ -10696,5 +11528,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10728,10 +11560,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10785,7 +11617,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10797,10 +11653,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10849,14 +11705,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10867,26 +11723,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10894,5 +11750,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10902,5 +11758,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10909,107 +11765,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11114,11 +11970,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11128,10 +11989,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11139,5 +12000,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11147,5 +12008,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11155,15 +12016,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11171,5 +12032,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11177,5 +12038,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11184,15 +12045,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11201,10 +12062,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11213,15 +12074,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11231,10 +12092,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11243,5 +12104,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11250,5 +12111,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11256,11 +12117,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11315,5 +12183,5 @@ #: build/trans_presets.java:55 msgid "Streets" -msgstr "" +msgstr "Tänavad" #. group "Streets" @@ -11429,5 +12297,5 @@ #: build/trans_presets.java:179 build/trans_presets.java:355 msgid "Lanes" -msgstr "" +msgstr "Rajad" #. item "Streets/Motorway" combo "Lanes" @@ -11501,5 +12369,5 @@ #: build/trans_presets.java:652 build/trans_presets.java:1284 msgid "Oneway" -msgstr "" +msgstr "Ühesuunaline" #. item "Streets/Motorway" check "Oneway" @@ -11555,5 +12423,5 @@ #: build/trans_presets.java:1285 build/trans_surveyor.java:12 msgid "Bridge" -msgstr "" +msgstr "Sild" #. item "Streets/Motorway" check "Bridge" @@ -11603,5 +12471,5 @@ #: build/trans_presets.java:1286 msgid "Tunnel" -msgstr "" +msgstr "Tunnel" #. item "Streets/Motorway" check "Tunnel" @@ -11869,5 +12737,5 @@ #: build/trans_presets.java:226 build/trans_surveyor.java:88 msgid "Residential" -msgstr "" +msgstr "Tänav" #. item @@ -11971,5 +12839,5 @@ #: build/trans_presets.java:262 msgid "Service" -msgstr "" +msgstr "Teenindus" #. item @@ -12415,58 +13283,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12480,6 +13296,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12505,6 +13321,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12530,6 +13346,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12555,6 +13371,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12568,5 +13384,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12584,5 +13400,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12616,6 +13432,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12642,6 +13458,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12665,5 +13481,5 @@ #: build/trans_presets.java:390 msgid "Ways" -msgstr "" +msgstr "Teed" #. group "Ways" @@ -12691,5 +13507,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "" @@ -12712,5 +13528,5 @@ #: build/trans_presets.java:432 msgid "Cycleway" -msgstr "" +msgstr "Jalgrattatee" #. item @@ -12726,5 +13542,5 @@ #: build/trans_presets.java:452 msgid "Footway" -msgstr "" +msgstr "Jalgtee" #. item @@ -12895,5 +13711,5 @@ #: build/trans_presets.java:663 msgid "Hiking" -msgstr "" +msgstr "Matkamine" #. item @@ -13048,5 +13864,5 @@ #: build/trans_presets.java:3009 msgid "Operator" -msgstr "" +msgstr "Operaatorfirma" #. item "Waypoints/Services" text "Operator" @@ -13191,5 +14007,5 @@ #: build/trans_presets.java:799 msgid "City Limit" -msgstr "" +msgstr "Linnapiiri märk" #. item @@ -13668,5 +14484,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -14206,5 +15022,5 @@ #: build/trans_presets.java:1385 build/trans_presets.java:1429 msgid "Shop" -msgstr "" +msgstr "Pood" #. item @@ -14271,5 +15087,5 @@ #: build/trans_presets.java:1437 msgid "Public Transport" -msgstr "" +msgstr "Avalik transport" #. item "Public Transport/Station" text "Name" @@ -14437,5 +15253,5 @@ #: build/trans_presets.java:1541 msgid "Accomodation" -msgstr "" +msgstr "Majutus" #. group "Accomodation" @@ -14538,5 +15354,5 @@ #: build/trans_presets.java:1591 msgid "Food+Drinks" -msgstr "" +msgstr "Toit ja jook" #. group "Food+Drinks" @@ -14547,5 +15363,5 @@ #: build/trans_presets.java:1592 build/trans_surveyor.java:47 msgid "Restaurant" -msgstr "" +msgstr "Restoran" #. item @@ -14593,5 +15409,5 @@ #: build/trans_presets.java:1597 build/trans_presets.java:1604 msgid "regional" -msgstr "" +msgstr "kohalik" #: build/trans_presets.java:1597 build/trans_presets.java:1604 @@ -14621,5 +15437,5 @@ #: build/trans_presets.java:1599 msgid "Fast Food" -msgstr "" +msgstr "Kiirtoit" #. item @@ -14631,5 +15447,5 @@ #: build/trans_presets.java:1606 msgid "Cafe" -msgstr "" +msgstr "Kohvik" #. item @@ -14642,5 +15458,5 @@ #: build/trans_presets.java:1612 msgid "Pub" -msgstr "" +msgstr "Pubi" #. item @@ -14663,5 +15479,5 @@ #: build/trans_presets.java:1623 msgid "Bar" -msgstr "" +msgstr "Baar" #. item @@ -14674,5 +15490,5 @@ #: build/trans_presets.java:1629 msgid "Nightclub" -msgstr "" +msgstr "Ööklubi" #. item @@ -14685,10 +15501,10 @@ #: build/trans_presets.java:1636 msgid "Tourism" -msgstr "" +msgstr "Turism" #. group "Tourism" #: build/trans_presets.java:1637 msgid "Attraction" -msgstr "" +msgstr "Vaatamisväärsus" #. item @@ -14703,10 +15519,10 @@ #: build/trans_presets.java:2381 msgid "Opening Hours" -msgstr "" +msgstr "Avatud" #. item "Tourism/Attraction" text "Opening Hours" #: build/trans_presets.java:1643 msgid "Museum" -msgstr "" +msgstr "Muuseum" #. item @@ -14719,5 +15535,5 @@ #: build/trans_presets.java:1649 msgid "Zoo" -msgstr "" +msgstr "Loomaaed" #. item @@ -14747,5 +15563,5 @@ #: build/trans_presets.java:1663 msgid "Theme Park" -msgstr "" +msgstr "Teemapark" #. item @@ -14769,5 +15585,5 @@ #: build/trans_presets.java:1675 msgid "Information Office" -msgstr "" +msgstr "Infopunkt" #. item @@ -14856,10 +15672,10 @@ #: build/trans_presets.java:1715 build/trans_presets.java:1721 msgid "Fireplace" -msgstr "" +msgstr "Lõkkease" #. item "Tourism/Shelter" check "Fireplace" #: build/trans_presets.java:1717 msgid "Picnic Site" -msgstr "" +msgstr "Piknikuplats" #. item @@ -14871,10 +15687,10 @@ #: build/trans_presets.java:1724 msgid "Historic Places" -msgstr "" +msgstr "Ajaloolised kohad" #. group "Historic Places" #: build/trans_presets.java:1725 msgid "Castle" -msgstr "" +msgstr "Loss" #. item @@ -14888,5 +15704,5 @@ #: build/trans_presets.java:1732 msgid "Ruins" -msgstr "" +msgstr "Varemed" #. item @@ -14922,5 +15738,5 @@ #: build/trans_presets.java:1751 msgid "Monument" -msgstr "" +msgstr "Monument" #. item @@ -14932,5 +15748,5 @@ #: build/trans_presets.java:1756 msgid "Memorial" -msgstr "" +msgstr "Mälestusmärk" #. item @@ -14963,10 +15779,10 @@ #: build/trans_presets.java:1773 msgid "Leisure" -msgstr "" +msgstr "Puhkus" #. group "Leisure" #: build/trans_presets.java:1774 msgid "Water Park" -msgstr "" +msgstr "Veepark" #. item @@ -14978,5 +15794,5 @@ #: build/trans_presets.java:1779 msgid "Playground" -msgstr "" +msgstr "Mänguväljak" #. item @@ -14989,5 +15805,5 @@ #: build/trans_presets.java:1785 msgid "Fishing" -msgstr "" +msgstr "Kalapüük" #. item @@ -15005,5 +15821,5 @@ #: build/trans_presets.java:1793 msgid "Stadium" -msgstr "" +msgstr "Staadion" #. item @@ -15023,5 +15839,5 @@ #: build/trans_presets.java:1816 build/trans_presets.java:1825 msgid "select sport:" -msgstr "" +msgstr "vali spordiala:" #. item "Sport Facilities/Stadium" label "select sport:" @@ -15397,27 +16213,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "" @@ -15470,5 +16286,5 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "canoe" -msgstr "" +msgstr "kanuu" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15510,10 +16326,10 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "football" -msgstr "" +msgstr "ameerika_jalgpall" #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "golf" -msgstr "" +msgstr "golf" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15570,10 +16386,10 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "skiing" -msgstr "" +msgstr "suusatamine" #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "soccer" -msgstr "" +msgstr "jalgpall" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15585,10 +16401,10 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "table_tennis" -msgstr "" +msgstr "lauatennis" #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "tennis" -msgstr "" +msgstr "tennis" #: build/trans_presets.java:1802 @@ -15621,5 +16437,5 @@ #: build/trans_presets.java:1829 msgid "Golf Course" -msgstr "" +msgstr "Golfiväljak" #. item @@ -15865,5 +16681,5 @@ #: build/trans_presets.java:1925 msgid "Swimming" -msgstr "" +msgstr "Ujumine" #. item @@ -15874,5 +16690,5 @@ #: build/trans_presets.java:1931 msgid "Skiing" -msgstr "" +msgstr "Suusatamine" #. item @@ -15890,13 +16706,13 @@ #: build/trans_presets.java:1936 msgid "downhill" -msgstr "" +msgstr "mägi" #: build/trans_presets.java:1936 msgid "nordic" -msgstr "" +msgstr "murdmaa" #: build/trans_presets.java:1936 msgid "snow_park" -msgstr "" +msgstr "lumepark" #: build/trans_presets.java:1937 @@ -15931,5 +16747,5 @@ #: build/trans_presets.java:1940 msgid "Shooting" -msgstr "" +msgstr "Lasketiir" #. item @@ -15946,5 +16762,5 @@ #: build/trans_presets.java:1949 msgid "Soccer" -msgstr "" +msgstr "Jalgpall" #. item @@ -16001,5 +16817,5 @@ #: build/trans_presets.java:1983 msgid "golf_course" -msgstr "" +msgstr "Golfiväljak" #: build/trans_presets.java:1985 @@ -16028,5 +16844,5 @@ #: build/trans_presets.java:1998 msgid "Edit Cricket" -msgstr "Redihgeeri kriket" +msgstr "Vali kriket" #: build/trans_presets.java:2003 @@ -16116,5 +16932,5 @@ #: build/trans_presets.java:2057 msgid "Public Building" -msgstr "" +msgstr "Avalik hoone" #. item @@ -16127,5 +16943,5 @@ #: build/trans_presets.java:2063 msgid "Town hall" -msgstr "Linna hall" +msgstr "Raekoda" #. item @@ -16133,5 +16949,5 @@ #: build/trans_presets.java:2065 msgid "Edit Town hall" -msgstr "Vali linna hall" +msgstr "Vali raekoda" #. item "Buildings/Town hall" text "Name" @@ -16198,5 +17014,5 @@ #: build/trans_presets.java:2104 msgid "Post Office" -msgstr "" +msgstr "Postkontor" #. item @@ -16248,5 +17064,5 @@ #: build/trans_presets.java:2130 msgid "Edit College" -msgstr "Vale kolledž" +msgstr "Vali kolledž" #. item "Buildings/College" text "Name" @@ -16301,5 +17117,5 @@ #: build/trans_presets.java:2162 msgid "Place of Worship" -msgstr "" +msgstr "Palvekoht" #. item @@ -16309,5 +17125,5 @@ #: build/trans_presets.java:2166 msgid "Edit Place of Worship" -msgstr "" +msgstr "Vali palvekoht" #. item "Buildings/Place of Worship" text "Name" @@ -16380,5 +17196,5 @@ #: build/trans_presets.java:2899 msgid "zoroastrian" -msgstr "zoroastrism (muinaspärslaste usund)" +msgstr "zoroastrism (pärsia)" #: build/trans_presets.java:2170 build/trans_presets.java:2891 @@ -16413,5 +17229,5 @@ #: build/trans_presets.java:2900 msgid "jehovahs_witness" -msgstr "jehoova_tunnistajad" +msgstr "jehoovatunnistajad" #: build/trans_presets.java:2170 build/trans_presets.java:2891 @@ -16458,5 +17274,5 @@ #: build/trans_presets.java:2900 msgid "shia" -msgstr "" +msgstr "šiia" #: build/trans_presets.java:2170 build/trans_presets.java:2891 @@ -16530,5 +17346,5 @@ #: build/trans_presets.java:2192 msgid "even" -msgstr "tasane" +msgstr "paaris" #: build/trans_presets.java:2192 @@ -16695,5 +17511,5 @@ #: build/trans_presets.java:2273 msgid "hydro" -msgstr "vesi" +msgstr "hüdro" #: build/trans_presets.java:2273 @@ -16703,5 +17519,5 @@ #: build/trans_presets.java:2273 msgid "nuclear" -msgstr "aatom" +msgstr "tuuma" #: build/trans_presets.java:2273 @@ -16727,10 +17543,10 @@ #: build/trans_presets.java:2279 msgid "Edit Power Station" -msgstr "Vali eliektrijaam" +msgstr "Vali elektrijaam" #. item "Man Made/Power Station" text "Operator" #: build/trans_presets.java:2283 msgid "Power Sub Station" -msgstr "Elektri alajaam" +msgstr "Elektrialajaam" #. item @@ -16787,5 +17603,5 @@ #: build/trans_presets.java:2310 msgid "Amenities" -msgstr "" +msgstr "Teenused" #. group "Amenities" @@ -16844,5 +17660,5 @@ #: build/trans_presets.java:2334 build/trans_presets.java:2413 msgid "Debit cards" -msgstr "Debet kaart" +msgstr "Deebetkaart" #. item "Amenities/Telephone" check "Debit cards" @@ -16850,5 +17666,5 @@ #: build/trans_presets.java:2335 build/trans_presets.java:2414 msgid "Credit cards" -msgstr "Krediit kaart" +msgstr "Krediitkaart" #. item "Amenities/Telephone" check "Credit cards" @@ -16967,5 +17783,5 @@ #: build/trans_presets.java:2372 msgid "Edit Drinking Water" -msgstr "Vali joogi vee asukoht" +msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" @@ -16998,5 +17814,5 @@ #: build/trans_presets.java:2390 msgid "Convenience Store" -msgstr "" +msgstr "Nurgakauplus" #. item @@ -17004,5 +17820,5 @@ #: build/trans_presets.java:2392 msgid "Edit Convenience Store" -msgstr "" +msgstr "Vali nurgakauplus" #. item "Shops/Convenience Store" text "Name" @@ -17097,5 +17913,5 @@ #: build/trans_presets.java:2406 msgid "condoms" -msgstr "ckondoomid" +msgstr "kondoomid" #: build/trans_presets.java:2406 @@ -17148,10 +17964,10 @@ #: build/trans_presets.java:2435 msgid "Organic" -msgstr "" +msgstr "Ökokaubad" #. item #: build/trans_presets.java:2436 msgid "Edit Organic Shop" -msgstr "" +msgstr "Redigeeri ökopoodi" #. item "Shops/Organic" text "Name" @@ -17169,5 +17985,5 @@ #: build/trans_presets.java:2446 msgid "Beverages" -msgstr "Joogi pood" +msgstr "Joogipood" #. item @@ -17184,5 +18000,5 @@ #: build/trans_presets.java:2452 msgid "Edit Computer Shop" -msgstr "Vali arvuti pood" +msgstr "Vali arvutipood" #. item "Shops/Computer" text "Name" @@ -17194,5 +18010,5 @@ #: build/trans_presets.java:2457 msgid "Edit Electronics Shop" -msgstr "Vali elktroonika pood" +msgstr "Vali elektroonika pood" #. item "Shops/Electronics" text "Name" @@ -17219,5 +18035,5 @@ #: build/trans_presets.java:2471 msgid "Garden Centre" -msgstr "Aia keskus" +msgstr "Aiakeskus" #. item @@ -17225,5 +18041,5 @@ #: build/trans_presets.java:2473 msgid "Edit Garden Centre" -msgstr "Vali aia keskus" +msgstr "Vali aiakeskus" #. item "Shops/Garden Centre" text "Name" @@ -17383,5 +18199,5 @@ #: build/trans_presets.java:2554 msgid "Edit Money Exchange" -msgstr "Vali raha vahetus punkt" +msgstr "Vali rahavahetus punkt" #. item @@ -17579,20 +18395,20 @@ #: build/trans_presets.java:2664 msgid "Village" -msgstr "Küla" +msgstr "Küla/Alevik/Alev" #. item #: build/trans_presets.java:2665 msgid "Edit Village" -msgstr "Muuda küla" +msgstr "Muuda küla/alevik/alev" #. item "Places/Village" text "Name" #: build/trans_presets.java:2670 msgid "Hamlet" -msgstr "Külake" +msgstr "Küla" #. item #: build/trans_presets.java:2671 msgid "Edit Hamlet" -msgstr "Muuda külakest" +msgstr "Muuda küla" #. item "Places/Hamlet" text "Name" @@ -17856,5 +18672,5 @@ #: build/trans_presets.java:2823 msgid "Meadow" -msgstr "Niit" +msgstr "Niit/Karjamaa" #. item @@ -18256,7 +19072,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "jalgrattaga" @@ -18326,7 +19142,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "jalgsi" @@ -18352,5 +19168,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metroo" @@ -18413,10 +19229,10 @@ #: build/trans_presets.java:3018 msgid "forward halt point" -msgstr "forward halt point" +msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" #: build/trans_presets.java:3019 msgid "backward halt point" -msgstr "backward halt point" +msgstr "tagasisuunaline peatuspunkt" #. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "tee" + #. color tertiary #. @@ -19139,6 +20017,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "tänav" @@ -19194,7 +20072,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "teerada" @@ -19250,8 +20128,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "raudtee" @@ -19272,7 +20150,7 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" -msgstr "" +msgstr "teenused" #. color services @@ -19284,5 +20162,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19303,5 +20181,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "tagasipööramisring" @@ -19316,5 +20194,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19329,5 +20207,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "jõekallas" @@ -19341,5 +20219,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "oja" @@ -19353,5 +20231,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "dokk" @@ -19379,5 +20257,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akvedukt" @@ -19545,13 +20423,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "inimtekkeline" @@ -19613,7 +20491,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19636,10 +20514,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "muu rööbastee" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "ülarelss" @@ -19675,7 +20553,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "kasutamata raudtee" @@ -19720,6 +20598,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "aeronautika" @@ -19733,5 +20611,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "lennuterminal" @@ -19753,5 +20631,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "helikopterid" @@ -19765,5 +20643,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "kerglennukid" @@ -19811,7 +20689,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "trosstransport" @@ -19828,5 +20706,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "suusanõlv lihtne" @@ -19841,5 +20719,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "suusanõlv keskmine" @@ -19854,5 +20732,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "suusanõlv edasijõudnutele" @@ -19867,5 +20745,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19880,5 +20758,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "suusanõlv klassita" @@ -19893,5 +20771,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "suusanõlv algajale" @@ -19996,10 +20874,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "elektrivarustus" @@ -20013,5 +20891,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "kai" @@ -20025,5 +20903,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "torujuhe" @@ -20151,12 +21029,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "puhkealad" @@ -20170,5 +21048,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "paadisadam" @@ -20240,8 +21118,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "mugavused" @@ -20343,10 +21221,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "autohooldus" @@ -20732,24 +21610,24 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" -msgstr "muud mugavused" +msgstr "muud teenused" #. color amenity_light @@ -20779,6 +21657,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "vesi" @@ -20839,8 +21717,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "tervishoid" @@ -21193,26 +22071,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "pood" @@ -21284,8 +22162,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotell" @@ -21435,9 +22313,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turism" @@ -21509,8 +22387,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "alalooline" @@ -21581,10 +22459,10 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" -msgstr "roheline" +msgstr "roheala" #. color green @@ -21596,5 +22474,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "kivimurd" @@ -21608,5 +22486,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "prügimägi" @@ -21628,5 +22506,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "tehisjärv" @@ -21640,5 +22518,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "kultuurmets" @@ -21652,5 +22530,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "taluõu" @@ -21673,5 +22551,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "kaubandus" @@ -21685,5 +22563,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "tööstus" @@ -21697,5 +22575,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "jäätmaa" @@ -21709,5 +22587,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "rohepiirkond" @@ -21721,5 +22599,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "raudteede piirkond" @@ -21776,7 +22654,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "militaarala" @@ -21790,5 +22668,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "kalmistu" @@ -21801,5 +22679,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "mäetipp" @@ -21814,5 +22692,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "liustik" @@ -21826,5 +22704,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulkaan" @@ -21879,8 +22757,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "looduslik" @@ -21894,5 +22772,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "põõsastik" @@ -21906,5 +22784,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "nõmm" @@ -21918,5 +22796,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "mets" @@ -21930,5 +22808,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "muda" @@ -21942,5 +22820,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "rand" @@ -22018,8 +22896,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "teekond" @@ -22067,7 +22945,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "piir" @@ -22209,10 +23087,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "koht" @@ -22260,6 +23138,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "aadress" @@ -22556,10 +23434,35 @@ msgstr "" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti." + +#~ msgid "API initialization failed" +#~ msgstr "API initsialiseerimine ebaõnnestus" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed " +#~ "laaditud?" + +#~ msgid "No data" +#~ msgstr "Andmeid pole" + +#~ msgid "Update failed" +#~ msgstr "Uuendamine ebaõnnestus" + +#~ msgid "Missing primitive" +#~ msgstr "Puuduv primitiiv" + +#~ msgid "Layers: {0}" +#~ msgstr "Kihid: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest" + #~ msgid "Data Layer" #~ msgstr "Andmekiht" -#~ msgid "Uploading data" -#~ msgstr "Andmete üles laadimine" - #~ msgid "Not implemented yet." #~ msgstr "Pole veel teostatud." @@ -22568,30 +23471,65 @@ #~ msgstr "E-post" -#~ msgid "Resolve Conflicts" -#~ msgstr "Lahenda konfliktid" +#~ msgid "their version:" +#~ msgstr "nende versioon:" + +#~ msgid "my version:" +#~ msgstr "minu versioon:" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM kasutajanimi (email)" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " +#~ "uuesti ." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n" + +#~ msgid "Aborting..." +#~ msgstr "Katkestan..." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Ühendun OSM serveriga" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Sildid (tühi väärtus kustutab sildi)" + +#~ msgid "Occupied By" +#~ msgstr "Kasutab" + +#~ msgid "Remove Selected" +#~ msgstr "Eemalda valitud" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena" + +#~ msgid "Add Selected" +#~ msgstr "Lisa valitud" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" + +#~ msgid "Cannot connect to server." +#~ msgstr "Ei saa serveriga ühenduda." + +#~ msgid "Error parsing server response." +#~ msgstr "Viga serveri vastuse töötlemisel." #~ msgid "There were conflicts during import." #~ msgstr "Importimisel tekkisid konfliktid." -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "my version:" -#~ msgstr "minu versioon:" - -#~ msgid "their version:" -#~ msgstr "nende versioon:" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM kasutajanimi (email)" - -#~ msgid "Unknown host" -#~ msgstr "Tundmatu host" - -#~ msgid "Change" -#~ msgstr "Muuda" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada" +#~ msgid "Basic" +#~ msgstr "Lihtne" #~ msgid "Revert" @@ -22608,44 +23546,6 @@ #~ "versiooniks." -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Sildid (tühi väärtus kustutab sildi)" - -#~ msgid "Error parsing server response." -#~ msgstr "Viga serveri vastuse töötlemisel." - -#~ msgid "Cannot connect to server." -#~ msgstr "Ei saa serveriga ühenduda." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast " -#~ "uuesti ." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME parandatud)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" +#~ msgid "Conflicts: {0}" +#~ msgstr "Konfliktid: {0}" #~ msgid "" @@ -22656,9 +23556,16 @@ #~ "laadida." -#~ msgid "Conflicts: {0}" -#~ msgstr "Konfliktid: {0}" - -#~ msgid "The projection could not be read from preferences. Using EPSG:4326" -#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Abileht puudub. Loo see english." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Abileht puudub. Loo see english või eesti" #~ msgid "" @@ -22669,4 +23576,25 @@ #~ "laetud elementidel on ajalugu." +#~ msgid "unnamed" +#~ msgstr "Nimetu" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME parandatud)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -22674,11 +23602,7 @@ #~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?" -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Abileht puudub. Loo see english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Abileht puudub. Loo see english või eesti" +#~ msgid "The projection could not be read from preferences. Using EPSG:4326" +#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326" + +#~ msgid "Change" +#~ msgstr "Muuda" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 16826) +++ /applications/editors/josm/i18n/po/fi.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:30+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-02 23:24+0000\n" +"Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Luodaan pääikkuna" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Tallentamattomia muutoksia" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Tallenna ja poistu" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Poistu tallentamatta" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Peruuta" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Varoitus" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "TUNTEMATON" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Tietoja" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Näytä tietoja-ruutu." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versio {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Edellinen muutos {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Javan versio {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Kotisivu" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Virheilmoitukset" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Tietoja" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Lueminut" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Versio" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Lisenssi" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Liitännäiset" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Tietoja JOSM:sta..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Tiedostoa ei löytynyt." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Varoitus" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Ole hyvä ja valitse poistettava rivi." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Valitse joko:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Yhdistä pisteet" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Lisää piste..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "Muokkaa: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Syötä uuden pisteen koordinaatit." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Anna asteet desimaalilukuna." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Leveysaste" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Pituusaste" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Siirrä pisteet ympyrän kehälle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Siirtää valitut pisteet ympyrän kehälle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +489,58 @@ msgstr "Työkalu: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Valitse ainakin neljä pistettä." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Kohdista pisteet samalle viivalle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Siirtää valitut pisteet samalle viivalle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Valitse ainakin kolme pistettä." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -349,18 +549,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +568,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "taso" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "valinta" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "ristiriita" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "lataa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Sovita näkymä {0}:aan." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Sovita {0} näkymään." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +617,30 @@ msgstr "Näytä: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Ei mitään valittuna" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -458,13 +650,13 @@ "ne?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Yhdistä silti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Vaihdetaanko suuntia?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -473,10 +665,10 @@ "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Käännä ja yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -484,20 +676,20 @@ msgstr "Syötä arvot kaikille ristiriidoille." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Ratkaise ristiriitoja" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Yhdistä {0} polkua" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Kaikki polut olivat tyhjiä" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -515,111 +707,148 @@ msgstr "Kopioi valitut objektit leikepöydälle." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Valitse jotain kopioitavaksi." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Luo ympyrä" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Luo ympyrän kolmesta valitusta pisteestä." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Valituista pisteistä ei voi muodostaa ympyrää." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Valitse joko tasan kolme pistettä, tai polku jossa on tasan kolme pistettä" + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Poista" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Poista valitut objektit." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Korvaa" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Kohdista pisteet tasavälein viivalle" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Lataa karttadataa OSM-palvelimelta." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Tiedosto: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Lataa" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Valitse vähintään yksi ladattava tietolaji." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Ristiriidassa oleva relaatio" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Monista" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Monista valinta kopioimalla ja liittämällä samantien." @@ -639,5 +868,5 @@ msgstr "Poistu ohjelmasta." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -647,58 +876,73 @@ "GPL:n alaisia jälkiä." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "GPX-vienti..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Vie data GPX-tiedostoon." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Ei mitään vietävää. Hae ensin dataa." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "gps-jäljen kuvaus" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Lisää tekijän tiedot" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Oikea nimi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "Sähköposti" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Tekijänoikeudet (URL-osoite)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Ennaltamääritelty" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Tekijänoikeuden vuosi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Avainsanat" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Vientiasetukset" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Vie ja tallenna" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -709,25 +953,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Virhe" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Valitse ennaltamääritetty lisenssi" @@ -737,46 +961,49 @@ msgstr "JOSM-verkko-ohje" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Avaa selaimessa" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Muokkaa" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Lataa uudelleen" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Virhe ladattaessa sivua {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -812,30 +1039,40 @@ msgstr "Yhdistää pisteen lähimpään polun segmenttiin." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Yhdistä piste ja polku." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Ei pikanäppäintä" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Yhdistä silti" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Yhdistä valittu taso alla olevaan 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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -845,68 +1082,79 @@ "ne?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Yhdistä silti" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Yhdistä {0} pistettä" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "valinta" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Siirrä valittuja jäseniä alaspäin" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Peilaa" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgstr "Peilaa valitut pisteet ja polut" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Valitse ainakin yksi solmu tai tie" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "ylös" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Siirrä objektit {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "alas" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "vasen" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "oikea" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Siirrä {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Siirtää objektit {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objekteja ei voi siirtää maailman ulkopuolelle" @@ -914,5 +1162,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Uusi" @@ -922,26 +1170,17 @@ msgstr "Luo uusi kartta." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "nimetön" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Avaa..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Avaa tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ei voitu lukea \"{0}\":aa" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -970,35 +1209,36 @@ msgstr "Lataa URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Suorakulmaista muoto" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Vain kaksi pistettä sallittu" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Valinnan pitää muodostua pelkistä poluista." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Käytät EPSG:4326-projektiota, joka voi johtaa
epätoivottuihin " @@ -1006,9 +1246,9 @@ "eroon tästä varoituksesta.
Haluatko jatkaa?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Vain yksi piste valittuna" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Suorakulmaista" @@ -1024,11 +1264,11 @@ msgstr "Liitä leikepöydän sisältö" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Liitä tagit" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Liitä valituille kohteille avain/arvo-parit leikepöydältä." @@ -1056,16 +1296,21 @@ msgstr "Toista edellinen kumottu toiminto" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Nimeä taso uudelleen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Nimeä myös tiedosto uudelleen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Tiedostoa \"{0}\" ei voitu nimetä uudelleen." @@ -1079,9 +1324,9 @@ msgstr "Kääntää valittujen polkujen suunnan." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Valitse ainakin yksi polku." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Käännä polut" @@ -1089,17 +1334,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Tallenna" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Tallenna tämänhetkinen data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1109,25 +1356,25 @@ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tyhjä dokumentti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokumentti ei sisällä tietoa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Tallenna silti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Ristiriidat" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1137,54 +1384,75 @@ "ristiriidoista. Jatka tallennusta?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Hylkää ristiriidat ja tallenna" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Tallenna OSM-tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Tallenna GPX-tiedosto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Tallenna kerros" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Tiedostoa ei voitu varmuuskopioida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Tuntematon tiedostopääte: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Tallennettaessa tapahtui virhe." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Varmuuskopion palauttamisessa tapahtui virhe." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Tuntematon tiedostopääte." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Tallennettaessa tapahtui virhe." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Varmuuskopion palauttamisessa tapahtui virhe." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Tallenna nimellä..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Tallenna data uuteen tiedostoon." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Valitse kaikki" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1217,16 +1485,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Sulje" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Katkaise polku" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Katkaisee polun valitun pisteen kohdalta." @@ -1236,5 +1504,5 @@ msgstr "Valintaa ei voida käyttää jakamiseen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1242,5 +1510,5 @@ msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1256,9 +1524,9 @@ "valitse myös polku jonka haluat katkaista." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Valitut pisteet eivät ole samalla polulla." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1266,10 +1534,10 @@ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1279,8 +1547,9 @@ "pisteitä, jotka eivät ole polun päissä.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Myös polun rooli relaatioissa kopioitiin kaikkiin uusiin polkuihin.\n" @@ -1288,11 +1557,15 @@ "korjaa tarvittaessa." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Myös polun rooli relaatioissa kopioitiin kaikkiin uusiin polkuihin.\n" +"Ole hyvä ja tarkista, että jäsenyys ja rooli relaatioissa on oikein, sekä " +"korjaa tarvittaessa." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1313,47 +1586,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Valitse joko:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Yksi piste jolla on tageja, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Yksi piste, joka on useamman polun käytössä, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1362,5 +1635,5 @@ "polkujen käytössä, tai" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1369,5 +1642,5 @@ "käytössä." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1380,9 +1653,9 @@ "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +msgstr "Irroitettu piste" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1390,5 +1663,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1404,141 +1677,91 @@ msgstr "Peru viimeisin toiminto." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Poista valinta" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Poista valinta kaikista objekteista." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta." -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut karttatietoja." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "GPX-tasoa ei löytynyt." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Lähetä OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Lisättävät objektit:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Muokattavat objektit:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Poistettavat objektit:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Lähetetäänkö nämä muutokset?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Lähetä muutokset" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Ei lähetettäviä muutoksia." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1552,17 +1775,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1573,53 +1796,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Lisättävät objektit:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Muokattavat objektit:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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 "" @@ -1708,42 +1942,54 @@ msgstr "Hitaammin eteenpäin" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Ladataan GPS-dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Ladattu GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Raaka GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Ladataan dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Dataa ei tuotu." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreeMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Lähetetään dataa" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1755,21 +2001,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Poistotila" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Poista pisteitä tai polkuja." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1777,5 +2023,5 @@ msgstr "Tila: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1786,750 +2032,23 @@ "käyttävät polut." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Piirrä" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Piirrä pisteitä" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "valitut" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Lisää piste" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Lisää piste polkuun" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Yhdistä olemassa oleva polku pisteeseen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Lisää piste polkuun ja yhdistä" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Luo uusi piste." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Valitse kursorin alla oleva piste." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Lisää uusi piste polkuun." -msgstr[1] "Lisää uusi piste {0} polkuun." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Aloita uusi polku viimeisestä pisteestä." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Jatka polkua viimeisestä pisteestä." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Lopeta piirtäminen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Luo alueita" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Valitse" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Valitse, siirrä ja pyöritä objekteja" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoomaus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoomaa ja siirrä karttaa" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Rajaa näytettävä alue: pidä valintanappia pohjassa ja vedä nurkasta toiseen. " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Etsi..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Etsi objekteja." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Ei dataa ladattuna." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Anna hakusana." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "korvaa valinta" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "lisää valintaan" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "poista valinnasta" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "kirjainkoko merkitsee" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "säännöllinen lauseke" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Etsi" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Löytyi {0} osumaa" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Säännöllisessä lausekkeessa \"{0}\" on virhe kohdassa {1}:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Päättävä sulkumerkki puuttuu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Ladataan..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Ei voitu lukea URL:stä: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Aseta {0}={1} kohteelle {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekti" -msgstr[1] "objektit" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Aseta {0}={1} kohteelle {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Poista {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Poista {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Ristiriidassa oleva relaatio" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n" -"Poistetaanko relaatiosta?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Poista relaatiosta" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n" -"Poistetaanko relaatiosta?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Katkaise polku" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
Tämä voi " -"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." -"
Oletko varma, että haluat poistaa ne?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Siirrä" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "piste" -msgstr[1] "pistettä" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Toteutetaanko?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden " -"ominaisuuksiin ovat suositeltuja." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relaatio" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Vanha rooli" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Uusi rooli" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Vanha avain" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Vanha arvo" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Uusi avain" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Uusi arvo" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Toteuta valtiut muutokset" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Älä toteuta muutoksia" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Ominaisuudet: " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automaattinen tagien korjaus" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Omien asetusten hakemistoa {0} ei voi avata." - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta " -"tiedostosta tehdään varmuuskopio: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Asetukset tallennettu kohteeseen {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Asetuksia ei voitu ladata palvelimelta." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2541,7 +2060,789 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Piirrä" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Piirrä pisteitä" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "valitut" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Lisää piste" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Lisää piste polkuun" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Yhdistä olemassa oleva polku pisteeseen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Lisää piste polkuun ja yhdistä" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Luo uusi piste." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Valitse kursorin alla oleva piste." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Lisää uusi piste polkuun." +msgstr[1] "Lisää uusi piste {0} polkuun." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Aloita uusi polku viimeisestä pisteestä." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Jatka polkua viimeisestä pisteestä." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Lopeta piirtäminen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Luo alueita" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Valitse" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Valitse, siirrä ja pyöritä objekteja" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Siirstämäsi objektien määrä ylitti {0}. Yleensä tämä on virhe.\n" +"Oletko varma että haluat siirtää ne?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Toteuta siirto" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Kumoa siirto" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoomaus" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoomaa ja siirrä karttaa" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Rajaa näytettävä alue: pidä valintanappia pohjassa ja vedä nurkasta toiseen. " +"Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Etsi..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Etsi objekteja." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Anna hakusana." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "korvaa valinta" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "lisää valintaan" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "poista valinnasta" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "kirjainkoko merkitsee" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "säännöllinen lauseke" + +#: ../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:95 +msgid "name:Bak - 'Bak' anywhere in the name." +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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +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 +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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Etsi" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Löytyi {0} osumaa" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Säännöllisessä lausekkeessa \"{0}\" on virhe kohdassa {1}:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Päättävä sulkumerkki puuttuu." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Lataa valinta" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Ladataan..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekti" +msgstr[1] "objektit" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Aseta {0}={1} kohteelle {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Ratkaise ristiriita" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n" +"Poistetaanko relaatiosta?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Katkaise polku" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.
Tämä voi " +"johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä." +"
Oletko varma, että haluat poistaa ne?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Poista relaatiosta" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Siirrä" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "piste" +msgstr[1] "pistettä" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Toteutetaanko?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Käännettäessä tätä polkua, seuraavat muutokset polun ja sen pisteiden " +"ominaisuuksiin ovat suositeltuja." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relaatio" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Vanha rooli" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Uusi rooli" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Vanha avain" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Vanha arvo" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Uusi avain" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Uusi arvo" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Toteuta valtiut muutokset" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Älä toteuta muutoksia" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Ominaisuudet: " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automaattinen tagien korjaus" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "" +"Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta " +"tiedostosta tehdään varmuuskopio: {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Asetukset tallennettu kohteeseen {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Asetuksia ei voitu ladata palvelimelta." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2570,5 +2871,5 @@ msgstr "I" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2577,27 +2878,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "keskeneräinen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Virhe: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Varoitus: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2605,13 +2906,13 @@ msgstr[1] "polkua" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2619,22 +2920,22 @@ msgstr[1] "relaatiot" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2648,23 +2949,23 @@ msgstr[1] "{0} jäsentä" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "tie" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "rata" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vesiväylä" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "maankäyttö" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2719,5 +3020,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2856,9 +3157,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2875,5 +3171,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "tausta" @@ -2884,8 +3180,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2896,5 +3192,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "" @@ -2917,22 +3213,126 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Kirjanmerkkejä ei voitu lukea." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Kirjanmerkkiä ei voitu kirjoittaa." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Älä näytä uudelleen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "tuntematon" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Odottamaton poikkeus" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Tuntematon palvelin" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Päivän viestiä ei ole saatavilla" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Ladataan \"Päivän viestiä\"" @@ -3007,62 +3407,57 @@ msgstr "Salasana" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "käyttö" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "valinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Näytä tämä ohje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Avaa tiedosto (gps-datana, jos *.gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Palauta oletusasetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Aseta kieli." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "esimerkkejä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3070,51 +3465,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktivoidaan päivitetyt liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Ladataan aikaisia liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Asetetaan oletuksia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Ladataan liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3122,21 +3517,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Rautalankanäkymä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Vaihda rautalankanäkymän päälläoloa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Koko näyttö -tila" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Ääni" @@ -3180,53 +3575,68 @@ msgstr "skaalaus" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Pituusaste osoittimen kohdalla." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Osoittmen kohdalla olevan objektin nimi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Leveysaste osoittimen kohdalla." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Piirrettävän segmentin suuntima." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Piirrettävän segmentin pituus." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(ei objektia)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "taso ei ole listassa." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Yhdistetään OSM-palvelimeen..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Virhe jäsennettäessä" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3248,4 +3658,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Alustetaan" @@ -3277,20 +3688,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Tagit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3298,47 +3709,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3346,25 +3757,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3401,5 +3812,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3410,5 +3821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3422,5 +3833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3495,7 +3906,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3569,14 +3979,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3605,10 +4015,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3617,19 +4027,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3638,9 +4048,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3650,13 +4060,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3664,90 +4074,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "poistettu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3757,5 +4167,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3780,12 +4190,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3830,10 +4239,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3842,10 +4251,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3854,5 +4263,5 @@ msgstr "Arvo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3913,9 +4322,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3923,5 +4332,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3951,42 +4360,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Tallenna silti" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Ratkaise ristiriidat" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4004,96 +4430,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Tasot" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Avaa lista kaikista ladatuista tasoista." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Poista valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Tallentamattomia muutoksia. Poistetaanko taso silti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Poista taso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Poistetaanko koko taso?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Tiedot" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "kyllä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "P" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Poista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Poista {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Näytä/piilota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Näytä/piilota valittu taso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Näytä/piilota teksti/kuvakkeet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Tasot" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Avaa lista kaikista ladatuista tasoista." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "yksityinen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Poista valittu taso." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Yhdistä valittu taso alla olevaan tasoon." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Siirrä valittu taso rivi alaspäin." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Yhdistä valittu taso alla olevaan tasoon." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Tasot: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Lisää tietoja tästä ominaisuudesta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4102,22 +4562,28 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Tyhjä arvo poistaa avaimen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Muutetaanko arvot?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4126,84 +4592,89 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Valitse avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Valitse arvo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Ominaisuudet/jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Valittujen objektien ominaisuudet." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Poistetaanko valinta relaatiosta {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lisää" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Muokkaa ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Poista asetukset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Ominaisuudet / Jäsenyydet" @@ -4212,63 +4683,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Avaa lista kaikista relaatioista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relaatiot: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Avaa valittu relaatio muokkaimeen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Poista valittu relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relaatiot: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Avaa valittu relaatio muokkaimeen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Poista valittu relaatio" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Tämänhetkinen valinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Avaa valintaikkuna." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Sovita näkymä valittuihin kohteisiin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Päivitä valintalista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Sovita näkymä valintaan" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Valinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4277,5 +4750,5 @@ msgstr[1] "{0} polkua" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4284,5 +4757,5 @@ msgstr[1] "{0} relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4293,5 +4766,10 @@ msgstr "Irroita paneeli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4300,143 +4778,409 @@ "työkalupalkin napista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Tekijät" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Näytä valittujen kohteiden muokkaajat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Tekijä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objektia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Muokkaajat: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Lataa alue" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Poista valittu relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Latauksen sijainti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relaatiot" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Ladataan dataa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relaatiot" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Toista edellinen kumottu toiminto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Siirrä valittuja jäseniä ylöspäin" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Siirrä valittuja jäseniä alaspäin" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Poista kaikki valitut objektit relaatiosta" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Poista valittu relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Ristiriidassa oleva relaatio" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Tallenna tämänhetkinen data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Lataa jäsenet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Varmista etähallinnan toimenpide" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Loitonna" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Siirrä valittuja jäseniä alaspäin" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Toteuta muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Perus" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Jäsen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Siirrä ylöspäin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Siirrä valittuja jäseniä ylöspäin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Lisää valitut" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Lisää valitut objektit jäseniksi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Poista valitut" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Poista kaikki valitut objektit relaatiosta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Siirrä alaspäin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Siirrä valittuja jäseniä alaspäin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Lataa jäsenet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relaatioeditori: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Lataa valinta" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4446,5 +5190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4454,25 +5198,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Ole hyvä ja lisää halutut koordinaatit ensin." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Ole hyvä ja anna nimi sijainnille." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "lisää valintaan" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Valitse ensin kirjanmerkki." @@ -4507,21 +5248,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Datalähteet ja -tyypit" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Lataa uutena tasona" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Lataa alue" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Ladattava alue on liian iso, palvelin todennäköisesti hylkää pyynnön" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4529,13 +5270,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Anna haettava merkkijono" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea" @@ -4543,5 +5284,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Syötä haettavan paikan nimi:" @@ -4549,5 +5290,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4555,6 +5296,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nimi" @@ -4593,6 +5334,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4615,15 +5356,15 @@ msgstr "tyyppi" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "lähellä" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4632,5 +5373,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4662,5 +5403,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5402,5 +6149,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5567,59 +6314,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Lue GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Ei aikaleimaa pisteelle {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Ei löytynyt aikaleimallisia kuvia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Luetaan {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geo-merkityt kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../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:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5627,138 +6374,128 @@ msgstr[1] "kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Tahdista kello" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-kuvat (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Kuva" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Tahdista aika GPS-yksikön kanssa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Syötettyä aikaa ei voitu tulkita oikein." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps-piste" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Muokkaa viivanpiirtotyyliä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Käytä globaaleja asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Piirrä viivat pisteiden välillä tällä tasolla." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Viivanpiirtoasetukset" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Muokkaa väriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Oletusarvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Valitse väri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Tuo äänitiedosto" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Ääniaaltotiedostot (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Tuo kuvia" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5767,5 +6504,5 @@ msgstr[1] "{0} jälkeä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5774,5 +6511,5 @@ msgstr[1] "{0} reittiä, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5781,30 +6518,30 @@ msgstr[1] "{0} reittipistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nimi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Kuvaus: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Ajanjakso: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Pituus: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Muuta datatasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5814,43 +6551,43 @@ "haitallisena.
Jos haluat lähettää jälkiä, katso:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Muutettu jäljestä {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} neliökilometriä" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5859,9 +6596,9 @@ msgstr "Tämä vaatii {0} erillistä latauspyyntöä.
Jatketaanko?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5869,5 +6606,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5875,47 +6612,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} poistettu)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5940,5 +6677,5 @@ msgstr[1] "jäljet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5946,5 +6683,5 @@ msgstr[1] "pisteet" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5953,5 +6690,5 @@ msgstr[1] "jälki, jossa on {0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5960,5 +6697,5 @@ msgstr[1] "{0}:ssä on {1} jälkeä" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5977,5 +6714,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5984,29 +6721,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Tahdista ääni" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Ääni tahdistettu pisteessä {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6014,10 +6751,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Näytä/piilota teksti/kuvakkeet" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6025,5 +6769,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6031,29 +6775,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL oli: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Virhe näytettäessä URL:ia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Lisäasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6061,26 +6805,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Nykyinen arvo on oletus." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Oletusarvo on \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Ole hyvä ja valitse muokattava rivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6088,14 +6832,14 @@ msgstr "Uusi arvo {0}:lle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Ole hyvä ja valitse poistettava rivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Anna uusi avain/arvo-pari" @@ -6220,40 +6964,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Väri" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Piirtotyyli {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Taso: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Valitse" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Valitse väri {0}:lle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Eri objekteille käytetyt värit." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Värit" @@ -6587,46 +7331,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Muokkaa käytettävien liitännäisten asetuksia." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Lataa lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Päivitä" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Muokkaa sivustoja..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Valitse kohta." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Muokkaa liitännäissivustoja" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Näyttöasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6634,29 +7386,29 @@ msgstr "Asetukset, jotka vaikuttavat ohjelman visuaaliseen ilmeeseen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Yhteysasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "OSM-palvelimen yhteysasetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Kartta-asetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Karttaprojektion ja datatulkinnan asetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Ääniasetukset" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Äänentoiston ja äänitiedostomerkkien asetukset." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6759,59 +7511,61 @@ msgstr "Pikanäppäin" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Poista valittu lähde listasta." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6989,33 +7743,33 @@ msgstr "Muuttujaryhmät" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Lisää tietoja tästä ominaisuudesta" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Lisäominaisuudet:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Käytä esivalintaa ”{0}”" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tuntematon tyyppi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7026,15 +7780,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7044,18 +7798,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -7066,33 +7820,36 @@ msgstr "Esivalintaryhmä ”{0}”" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Yhdistetään OSM-palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Ladataan pisteet {0}-{1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Ladataan OSM-karttatietoja..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Valmistellaan karttatietoja..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ei voitu lukea \"{0}\":aa" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7100,21 +7857,21 @@ msgstr "GPX-tiedostot" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Merkinnät: {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7130,10 +7887,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7141,48 +7917,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 -tiedostot" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Tuodut koordinaatit: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Tarkistussummavrihe: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA-tuonti onnistui" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA-tuonti epäonnistui" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7191,15 +7966,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7207,23 +7982,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Luodaan muutoskokoelma..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Suljetaan muutoskokoelma..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Lähetetään..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Tutkii hakemistoa {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7266,9 +8054,4 @@ msgid "Login" msgstr "Kirjaudu sisään" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Keskeytetään..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7319,66 +8102,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Virhe jäsennettäessä." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM-palvelintiedostot" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Tuntematon versio" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "-elementti muussa kuin polussa." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "-tagi muussa kuin relaatiossa." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Virheellinen objekti (id=0)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7386,51 +8173,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Puuttuva pakollinen attribuutti \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Valmistellaan OSM-karttatietoja..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Vääränlainen pisteen id" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Yhdistetään palvelimeen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7439,16 +8259,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Päivitä liitännäiset" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Lataa liitännäiset" @@ -7465,5 +8280,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7472,23 +8287,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7499,19 +8314,17 @@ msgstr "Tapahtui virhe liitännäisessä {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Varoitus: liitännäinen {0} oli pyydettyjen listalla, muttei ole enää " "tarpeellinen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -7519,15 +8332,15 @@ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Liitännäistä ei löytynyt: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7537,21 +8350,21 @@ "
asettamalla ”plginmanager.warntime”-asetuksen)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Poista liitännäinen käytöstä" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7561,5 +8374,5 @@ "on oikeus korvata vanhat tiedostot." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7567,10 +8380,10 @@ msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7578,9 +8391,9 @@ "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Pitäisikö liitännäinen poistaa käytöstä?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7590,25 +8403,23 @@ "liitännäisen käytöstä." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Tiedot" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Liitännäistietoja ei löytynyt." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "kuvausta ei ole saatavilla" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7617,13 +8428,18 @@ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Liitännäistietoja ei löytynyt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Kaikki asennetut liitännäiset ovat ajantasalla." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7636,9 +8452,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Lataa puuttuvat liitännäiset" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7651,57 +8467,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "tuntematon" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versio {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Liitännäinen tulee JOSM:n mukana" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Virhe luettaessa liitännäisten tiedot sisältävää tiedostoa: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Tämä on nauhoituksen lopun jälkeen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Virhe äänentoistossa" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Älä tee mitään" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Ilmoita ohjelmavirheestä" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7715,14 +8509,14 @@ "JOSM:n versiota, ilmoita ohjelmavirheestä." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Odottamaton poikkeus" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Tee virheilmoitus osoitteessa {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7730,5 +8524,5 @@ "virhetilanteeseen." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7738,17 +8532,33 @@ "kirjoittamista." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Teksti on jo kopioitu leikepöydälle)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Älä näytä uudelleen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7761,5 +8571,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7769,5 +8579,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7778,13 +8588,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Vihje: Voit muokata pikanäppäimiä asetuksista.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7792,21 +8617,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7814,74 +8639,75 @@ msgstr "Lähetä jäljet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Julkinen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Kuvaus" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Yhdistetään..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Lähetys peruttu" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Virhe lähetettäessä" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-jäljen lähetys onnistui" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Lähetään GPX-jälkeä: {0}% ({1} / {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPX-tasoa ei valittuna. Ei voida lähettää jälkeä." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Lähetetään GPX-jälkeä" @@ -7951,33 +8777,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Luetaan kuvia..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Tutkii hakemistoa {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Sijoittele GPX-tiedoston mukaisesti" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7997,15 +8824,15 @@ msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Virhe tulkittaessa {0}:aa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8016,34 +8843,34 @@ "kuva.
Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Kuvausaika (kuvan EXIF-tiedoista):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "GPS:n aika (lue ylläolevasta kuvasta): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [pp/kk/vvvv tt:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Ei päivämäärää" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Avaa toinen kuva" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8053,69 +8880,69 @@ "Ole hyvä ja syötä aika pyydetyssä muodossa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Virheellinen päivämäärä" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX-jälki: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Avaa toinen GPX-jälki" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Aikavyöhyke: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Kaikki kuvat" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8124,9 +8951,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Virheellinen aikavyöhyke" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8135,65 +8962,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8201,13 +9028,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8229,5 +9056,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" @@ -8250,6 +9077,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8413,22 +9240,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8436,18 +9263,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8560,6 +9387,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Tyhjä taso" @@ -8588,5 +9415,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8595,14 +9422,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8690,4 +9517,9 @@ msgstr "Polkua jonka pisteet eivät ole järjestyksessä, ei voi monistaa." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Ei dataa ladattuna." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8698,9 +9530,9 @@ msgstr "Luo kopio polusta" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8821,30 +9653,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8853,14 +9685,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -8951,40 +9783,40 @@ msgstr "Avaa kuvat ImageWayPoint:lla" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Etsitään rantaviivaa..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} pistettä tähänmennessä..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Virhe luotaessa välimuistihakemistoa: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Jäljitetään" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "tarkistetaan välimuisti..." @@ -8993,26 +9825,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Poistetaan turhat pisteet..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Suoritetaan Douglas-Peucker-arviointi..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Poistetaan pisteiden kaksoiskappaleet..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker-ääriviiva" @@ -9097,7 +9921,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "vesi" @@ -9252,9 +10076,9 @@ msgstr "Lakevalker-liitännäisen asetukset" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Ladataan kuvaa..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kuvaa ei voitu ladata" @@ -9498,18 +10322,18 @@ msgstr "Tuntematon ongelman tila" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Avaa näkymään osuvat..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Avaa ainoastaan tiedostot, jotka näkyvät nykyisessä näkymässä." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9536,33 +10360,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "lataa data API:sta" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "vaihda valinta" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "vaihda näkymä" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "varmista kaikki etähallinnan toimenpiteet käsin" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Etähallinta" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Asetukset etähallintaliitännäiselle." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9573,28 +10397,28 @@ "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Sallitut toiminnot" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Etähallinta on pyytänyt datan lataamista API:sta." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Pyynnös tiedot: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Sallitaanko tämä?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Varmista etähallinnan toimenpide" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9858,4 +10682,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10108,33 +10953,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10167,6 +11012,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Tarkistusvirheet" @@ -10176,10 +11021,10 @@ msgstr "Ei virheitä" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Ruudukko" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10270,5 +11115,5 @@ msgstr "Suorittaa datantarkistuksen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" @@ -10276,19 +11121,11 @@ "Lähetetäänkö muutokset silti?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Avaa tarkistusikkuna." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoomaa ongelmaan" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Tarkista" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Tarkista joko nykyinen valitna tai koko data." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10361,22 +11198,22 @@ msgstr "Risteävät polut" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Päällekkäiset pisteet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Polkujen pisteiden kaksoiskappaleet." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Etsii polkuja, joissa sama solmu toistuu useasti peräkkäin" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Polkujen pisteiden kaksoiskappaleet" @@ -10454,23 +11291,23 @@ "Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Ominaisuustarkistin:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Etsii virheellisiä avain/arvo-pareja." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Epäkelpo oikeinkirjoituksen tarkistussääntö: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10481,7 +11318,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Virheelliset avain/arvo-parit" @@ -10489,79 +11326,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Piirto-ongelma" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Avain \"{0}\" virheellinen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Tyhjät arvot" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Epäkelpo avain" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Virheellinen välilyönti avaimessa" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Arvossa välilyönti alussa tai lopussa" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Avaimen arvossa HTML-entiteettikoodeja" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXME-avain (korjattavia karttakohteita)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Tarkista ominaisuuksien avaimet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10572,84 +11411,84 @@ "php/User:JLS/speller )" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Lisää tiedosto" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Tarkista ominaisuuksien arvot." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Etsi FIXME:t" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Etsii solmut ja polut joissa arvona FIXME" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Tarkista muokkausnäkymän piirto-ongelmat" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Käytä oletussääntötiedostoa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Käytä oletusoikeinkirjoitussääntöjä." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10795,7 +11634,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "rakennus" @@ -10809,5 +11648,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "alue" @@ -10841,10 +11680,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Tagittomia irrallisia solmuja" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10902,8 +11741,32 @@ msgstr "Maa-alue väärin päin: maan pitää olla polun vasemmalla puolella." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10914,10 +11777,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10966,14 +11829,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Suoristettu kuva..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10984,26 +11847,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11011,5 +11874,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11019,5 +11882,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11026,19 +11889,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automaattinen lataus" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11047,88 +11910,88 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston." -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "WMS-liitännäisen asetukset" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11235,11 +12098,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11249,10 +12117,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11260,5 +12128,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11268,5 +12136,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11276,15 +12144,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11292,5 +12160,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11298,5 +12166,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11305,15 +12173,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11322,10 +12190,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11334,15 +12202,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11352,10 +12220,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11364,5 +12232,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11371,5 +12239,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11377,11 +12245,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12536,58 +13411,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12601,6 +13424,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "moottoritie" @@ -12626,6 +13449,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "valtatie" @@ -12651,6 +13474,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "kantatie" @@ -12676,6 +13499,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "seututie" @@ -12689,5 +13512,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "yhdystie" @@ -12705,5 +13528,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "asuinkatu" @@ -12737,6 +13560,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12763,6 +13586,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12812,5 +13635,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "kiertoliittymä" @@ -13789,5 +14612,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "suo" @@ -15518,27 +16341,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "urheilu" @@ -18377,7 +19200,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "polkupyörä" @@ -18447,7 +19270,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18473,5 +19296,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -18962,13 +19785,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -19010,5 +19833,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19228,4 +20051,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "moottoritie" + #. color tertiary #. @@ -19260,6 +20145,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19315,7 +20200,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19371,8 +20256,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19393,5 +20278,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19405,5 +20290,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19424,5 +20309,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "kääntöympyrä" @@ -19437,5 +20322,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19450,5 +20335,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19462,5 +20347,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19474,5 +20359,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19500,5 +20385,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19666,13 +20551,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19734,7 +20619,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19757,10 +20642,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19796,7 +20681,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19841,6 +20726,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19854,5 +20739,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminaali" @@ -19874,5 +20759,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19886,5 +20771,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19932,7 +20817,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "köysirata" @@ -19949,5 +20834,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19962,5 +20847,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19975,5 +20860,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19988,5 +20873,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20001,5 +20886,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20014,5 +20899,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20117,10 +21002,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20134,5 +21019,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "laituri" @@ -20146,5 +21031,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20272,12 +21157,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20291,5 +21176,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20361,8 +21246,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20464,10 +21349,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20853,22 +21738,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20900,6 +21785,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20960,8 +21845,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21314,26 +22199,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "kauppa" @@ -21405,8 +22290,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotelli" @@ -21556,9 +22441,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turismi" @@ -21630,8 +22515,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historiallinen" @@ -21702,8 +22587,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21717,5 +22602,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "louhos" @@ -21729,5 +22614,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "kaatopaikka" @@ -21749,5 +22634,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "valuma-alue" @@ -21761,5 +22646,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "talousmetsä" @@ -21773,5 +22658,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21794,5 +22679,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21806,5 +22691,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21818,5 +22703,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21830,5 +22715,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21842,5 +22727,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21897,7 +22782,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21911,5 +22796,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "hautausmaa" @@ -21922,5 +22807,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "huippu" @@ -21935,5 +22820,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "jäätikkö" @@ -21947,5 +22832,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "tulivuori" @@ -22000,8 +22885,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -22015,5 +22900,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "pusikko" @@ -22027,5 +22912,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "nummi" @@ -22039,5 +22924,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "metsä" @@ -22051,5 +22936,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "muta" @@ -22063,5 +22948,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "ranta" @@ -22139,8 +23024,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "reitti" @@ -22188,7 +23073,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "raja" @@ -22330,10 +23215,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22381,6 +23266,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "osoite" @@ -22677,74 +23562,135 @@ msgstr "" +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut " +#~ "karttatietoja." + +#~ msgid "Update failed" +#~ msgstr "Päivitys epäonnistui" + +#~ msgid "Layers: {0}" +#~ msgstr "Tasot: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus." + +#~ msgid "Validate" +#~ msgstr "Tarkista" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Tarkista joko nykyinen valitna tai koko data." + +#~ msgid "Aborting..." +#~ msgstr "Keskeytetään..." + +#~ msgid "Add Selected" +#~ msgstr "Lisää valitut" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisää valitut objektit jäseniksi" + +#~ msgid "Revert" +#~ msgstr "Palauta" + +#~ msgid "Date" +#~ msgstr "Päivämäärä" + +#~ msgid "Object" +#~ msgstr "Objekti" + +#~ msgid "Not implemented yet." +#~ msgstr "Ominaisuutta ei ole vielä toteutettu." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." + +#~ msgid "Email" +#~ msgstr "Sähköpostiosoite" + +#~ msgid "Error parsing server response." +#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" + +#~ msgid "my version:" +#~ msgstr "minun versioni:" + +#~ msgid "their version:" +#~ msgstr "palvelimen versio:" + +#~ msgid "Rotate" +#~ msgstr "Kierrä" + +#~ msgid "Change" +#~ msgstr "Muokkaa" + +#~ msgid "position" +#~ msgstr "sijainti" + +#~ msgid "false" +#~ msgstr "epätosi" + +#~ msgid "true" +#~ msgstr "tosi" + +#~ msgid "different" +#~ msgstr "eri" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "unnamed" +#~ msgstr "nimetön" + #~ msgid "Data Layer" #~ msgstr "Datataso" -#~ msgid "Uploading data" -#~ msgstr "Lähetetään dataa" - -#~ msgid "Not implemented yet." -#~ msgstr "Ominaisuutta ei ole vielä toteutettu." - -#~ msgid "Email" -#~ msgstr "Sähköpostiosoite" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Ratkaise ristiriidat" +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" + +#~ msgid "Import TCX File..." +#~ msgstr "Tuo TCX-tiedosto..." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Jotkin pisteet ovat (melkein) viivalla" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi " +#~ "ja siirtääksesi näkymää." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan." + +#~ msgid "Commit comment" +#~ msgstr "Lähetä kommentti" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai " +#~ "yritä myöhemmin uudestaan." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Yhdistetään OSM-palvelimeen..." #~ msgid "There were conflicts during import." #~ msgstr "Tuonnin aikana oli ristiriitoja." - -#~ msgid "Object" -#~ msgstr "Objekti" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objektilla on ristiriita:" -#~ msgstr[1] "{0} objektilla on ristiriitoja:" - -#~ msgid "my version:" -#~ msgstr "minun versioni:" - -#~ msgid "their version:" -#~ msgstr "palvelimen versio:" - -#~ msgid "resolved version:" -#~ msgstr "Ristiriidan ratkaisuksi valittu versio:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" - -#~ msgid "Unknown host" -#~ msgstr "Tuntematon palvelin" - -#~ msgid "position" -#~ msgstr "sijainti" - -#~ msgid "different" -#~ msgstr "eri" - -#~ msgid "true" -#~ msgstr "tosi" - -#~ msgid "false" -#~ msgstr "epätosi" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa" - -#~ msgid "Change" -#~ msgstr "Muokkaa" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan." - -#~ msgid "Revert" -#~ msgstr "Palauta" - -#~ msgid "Date" -#~ msgstr "Päivämäärä" #~ msgid "" @@ -22755,123 +23701,47 @@ #~ "versioon." -#~ msgid "Rotate" -#~ msgstr "Kierrä" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tagit (tyhjä arvo poistaa tagin)" - -#~ msgid "Error parsing server response." -#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." - #~ msgid "Cannot connect to server." #~ msgstr "Palvelimeen ei voida yhdistää." -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi " -#~ "ja siirtääksesi näkymää." +#~ msgid "Tagging preset sources" +#~ msgstr "Tagien esivalintojen lähteet" + +#~ msgid "Tagging preset source" +#~ msgstr "Tagien esiasetusten lähde" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Lisää uusi tagien esivalintalähde listaan." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Liitännäinen on jo olemassa" #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto." -#~ msgid "Tagging preset source" -#~ msgstr "Tagien esiasetusten lähde" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Lisää uusi tagien esivalintalähde listaan." - -#~ msgid "Tagging preset sources" -#~ msgstr "Tagien esivalintojen lähteet" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai " -#~ "yritä myöhemmin uudestaan." - -#~ msgid "Commit comment" -#~ msgstr "Lähetä kommentti" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM " -#~ "uudelleen." -#~ msgstr[1] "" -#~ "{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM " -#~ "uudelleen." - #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa " -#~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Server does not support changesets" -#~ msgstr "Palvelin ei tue muutoskokoelmia" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Liitännäinen on jo olemassa" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Jotkin pisteet ovat (melkein) viivalla" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?" #~ msgid "Drawbridge" #~ msgstr "Laskusilta" -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Tuo TCX-tiedosto..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "VAROITUS: Salasana on tallennettu asetustiedostoon ilman " -#~ "minkäänlaista salausta.
Salasana lähetetään salaamattomana " -#~ "palvelimelle URL-osoitteessa.
Älä käytä arvokasta salasanaa." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja " -#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets" +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objektilla on ristiriita:" +#~ msgstr[1] "{0} objektilla on ristiriitoja:" #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä" -#~ msgid "Portcullis" -#~ msgstr "Laskuristikko" +#~ msgid "Occupied By" +#~ msgstr "Jäsen" #~ msgid "" @@ -22906,4 +23776,22 @@ #~ "{0}" +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM " +#~ "uudelleen." +#~ msgstr[1] "" +#~ "{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM " +#~ "uudelleen." + +#~ msgid "resolved version:" +#~ msgstr "Ristiriidan ratkaisuksi valittu versio:" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin" + #~ msgid "Conflicts: {0}" #~ msgstr "Ristiriidat: {0}" @@ -22912,6 +23800,53 @@ #~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus" -#~ msgid "Solve Conflict" -#~ msgstr "Ratkaise ristiriita" +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "VAROITUS: Salasana on tallennettu asetustiedostoon ilman " +#~ "minkäänlaista salausta.
Salasana lähetetään salaamattomana " +#~ "palvelimelle URL-osoitteessa.
Älä käytä arvokasta salasanaa." + +#~ msgid "Portcullis" +#~ msgstr "Laskuristikko" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tagit (tyhjä arvo poistaa tagin)" + +#~ msgid "Remove Selected" +#~ msgstr "Poista valitut" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n" + +#~ msgid "Move Down" +#~ msgstr "Siirrä alaspäin" + +#~ msgid "Move Up" +#~ msgstr "Siirrä ylöspäin" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relaatioeditori: {0}" + +#~ msgid "Server does not support changesets" +#~ msgstr "Palvelin ei tue muutoskokoelmia" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa " +#~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla." + +#~ msgid "Basic" +#~ msgstr "Perus" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Muokkaa laskusillan ominaisuuksia" + +#~ msgid "Edit Portcullis" +#~ msgstr "Muokkaa laskuristikkoa" #~ msgid "" @@ -22929,7 +23864,8 @@ #~ "haluat jatkaa?" -#~ msgid "Edit Drawbridge" -#~ msgstr "Muokkaa laskusillan ominaisuuksia" - -#~ msgid "Edit Portcullis" -#~ msgstr "Muokkaa laskuristikkoa" +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja " +#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 16826) +++ /applications/editors/josm/i18n/po/fr.po (revision 16827) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-09 11:33+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-01 11:05+0000\n" +"Last-Translator: Sébastien Beaujard \n" "Language-Team: Fr\n" "MIME-Version: 1.0\n" @@ -14,26 +14,103 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Création de l’interface graphique d'utilisateur (GUI)" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Erreur" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -41,10 +118,10 @@ "sur le serveur." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" @@ -52,47 +129,50 @@ "et continuer ?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Enregistrer et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Annuler et quitter" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -101,32 +181,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Annuler" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorant l’URL malformé : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Avertissement" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorant l URL malformé du fichier : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "INCONNU" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "À propos" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Afficher l’à propos." @@ -134,10 +274,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -145,5 +285,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -152,19 +292,19 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Dernier changement le {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Version de Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Page d’accueil" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Rapports d'erreur" @@ -174,37 +314,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Lisez-moi" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Révision" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Contribution" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licence" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Greffons" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "À propos de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Impossible de trouver le fichier." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -216,17 +360,10 @@ "\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Avertissement" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -237,7 +374,35 @@ "primitives sélectionnées uniquement." +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Veuillez sélectionnez la rangée à supprimer." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Sélectionner au choix :" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Fusionner les nœuds" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Ajouter un nœud..." @@ -249,14 +414,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -264,57 +431,57 @@ msgstr "Modifier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Entrer les coordonnées pour le nouveau nœud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Utiliser des degrés décimaux." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l'hémisphère." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitude" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Placer les nœuds en cercle" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Déplacer les nœuds sélectionnés en un cercle." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -330,25 +497,58 @@ msgstr "Outil : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "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:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Aligner les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Déplacer les nœuds sélectionnés sur une ligne." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Veuillez sélectionner au moins trois nœuds." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -359,18 +559,10 @@ "courant : {0}, maximum : {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Violation des capacités de l’API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Échec d’initialisation de l’API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -381,5 +573,5 @@ "primitive supprimée {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -390,9 +582,9 @@ "longueur maximale autorisée {2}. la longueur actuelle est de {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Violation de la condition prédéfinie" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -401,37 +593,37 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "les données" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "le calque" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "la sélection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "le conflit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zoom sur {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Zoomer la vue sur {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -441,31 +633,31 @@ msgstr "Afficher : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Rien de sélectionné sur lequel zoomer." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "" "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -475,13 +667,13 @@ "Voulez-vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../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:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Changer les directions ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -491,10 +683,10 @@ "la même direction. En retourner certaines ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Inverser et fusionner" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -502,20 +694,20 @@ msgstr "Entrer des valeurs pour tous les conflits." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} voies" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Toutes les voies étaient vides" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -534,111 +726,149 @@ msgstr "Copier les objets sélectionnés dans la mémoire tampon." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Veuillez sélectionner quelque chose à copier." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Créer un cercle" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Créer un cercle à partir de trois nœuds sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Ces nœuds ne sont pas en cercle." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Veuillez sélectionner exactement deux ou trois nœuds ou un chemin avec " +"exactement deux ou trois nœuds." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Supprimer" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Supprimer les objets sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Écrire dessus" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribuer les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 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:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Fichier : {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Veuillez sélectionner au moins une tâche à télécharger" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Il y a eu {0} conflits durant l'import." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Erreurs durant le téléchargement" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Dupliquer" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Dupliquer la sélection par un copier-coller immédiat." @@ -658,5 +888,5 @@ msgstr "Quitter l’application." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -666,58 +896,73 @@ "de traces sous licence GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exporter en GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exporter les données vers un fichier GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Rien à exporter. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "le paramètre \"{0}\" ne doit pas être nul" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "description de la trace GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Ajouter des informations sur l’auteur" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nom réel" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Prédéfini" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Année du copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Mots-clés" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Options d’export" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exporter et sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -728,25 +973,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Erreur" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Choisir une licence prédéfinie" @@ -756,47 +981,50 @@ msgstr "Aide en ligne de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Ouvrir dans le navigateur" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Édition" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Recharger" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" "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:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, 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:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, 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:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -834,30 +1062,41 @@ msgstr "Joindre un nœud au chemin le plus proche." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Joindre le nœud et la ligne" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Pas de raccourci" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Fusionner tout de même" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "" +"Fusionner le calque immédiatement en dessous avec le calque sélectionné." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -867,9 +1106,9 @@ "vous encore les fusionner ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Fusionner tout de même" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -877,60 +1116,71 @@ "encore utilisé" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Fusionner {0} nœuds" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Met à jour la sélection de primitive depuis le serveur" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Mirroir" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Inverse les nœuds et chemins sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Veuillez sélectionner au moins un nœud ou chemin" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "haut" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Déplacer des objets {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "bas" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "gauche" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "droite" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Déplacer {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Déplacer les objets {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Impossible de déplacer des objets en dehors de la Terre." @@ -938,5 +1188,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nouveau" @@ -946,26 +1196,17 @@ msgstr "Créer une nouvelle carte." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "sans-nom" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Ouvrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Ouvrir un fichier" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Impossible de lire \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -994,22 +1235,22 @@ msgstr "Télécharger l'URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Rendre une forme orthogonale" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Seulement deux nœuds autorisés" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "La selection ne doit contenir uniquement que des chemins" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1017,5 +1258,5 @@ "nœuds." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" @@ -1023,9 +1264,10 @@ "orthogonaliser." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Vous utilisez la projection EPSG:4326 qui peut conduire
à des " @@ -1033,9 +1275,9 @@ "de projection pour supprimer cet avertissement.
Voulez-vous continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Seulement un nœud sélectionné" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Orthogonaliser" @@ -1051,11 +1293,11 @@ msgstr "Coller les contenus du presse-papier." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Copier les étiquettes" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1084,16 +1326,21 @@ msgstr "Refaire la dernière action annulée" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Renommer le calque" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Renommer également le fichier" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Impossible de renommer le fichier \"{0}\"." @@ -1107,9 +1354,9 @@ msgstr "Inverser la direction de tous les chemins sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Veuillez sélectionner au moins un chemin." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Inverser les chemins" @@ -1117,17 +1364,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Sauvegarder" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Le fichier {0} existe. L'écraser ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1137,25 +1386,25 @@ "Merci de signaler ceci comme une erreur." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Aucun document ouvert donc rien à sauvegarder." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Document vide" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Le document ne contient pas de données." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Sauvegarder tout de même" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflits" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1165,54 +1414,77 @@ "sauvegardés si vous ne les traitez pas. Continuer ?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Rejeter les conflits et sauvegarder" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Sauvegarder le fichier OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Sauvegarder le fichier GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Sauvegarder le calque" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Impossible de sauvegarder le fichier." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Extension de fichier inconnue : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Une erreur est survenue durant la communication avec le " +"serveur
Détails :{0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Une erreur est survenue lors de la restauration de la sauvegarde." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Extension de fichier inconnue." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Une erreur est survenue lors de la sauvegarde." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Une erreur est survenue lors de la restauration de la sauvegarde." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Enregistrer sous…" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Sauvegarder les données actuelles dans un nouveau fichier." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Tout sélectionner" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1247,16 +1519,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Fermer" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Couper un chemin" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Séparer un chemin au nœud sélectionné." @@ -1266,5 +1538,5 @@ msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1272,5 +1544,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:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1286,9 +1558,9 @@ "sélectionner le chemin également." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Les nœuds sélectionnés ne font pas partie du même chemin." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1296,11 +1568,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:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1310,8 +1582,9 @@ "sélectionner les nœuds au milieu du chemin.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Tous les nouveaux chemins ont été ajoutés à une relation basée sur \"role" @@ -1319,13 +1592,14 @@ "Vous devriez vérifier cela et corriger si nécessaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Une appartenance à une relation a été copiée à tous les nouveaux chemins.\n" "Vous devriez vérifier cela et le corriger si nécessaire." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1346,46 +1620,46 @@ 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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Sélectionner au choix :" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Un nœud taggué, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Un nœud utilisé par plus d’un chemin, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1393,10 +1667,10 @@ "* 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:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." 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:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1410,9 +1684,9 @@ "sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Nœud séparé" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1420,5 +1694,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1434,29 +1708,29 @@ msgstr "Annuler la dernière action." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Tout dé-sélectionner" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Dé-sélectionner tous les objets." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Désélectionner tout (Focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Désélectionner tout (Echap)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Mettre à jour les données" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" @@ -1464,115 +1738,65 @@ "les données)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une " -"couche de données ?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Échec de la mise à jour des primitives sélectionnées." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "La mise à jour a échoué" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Pas de calque de données GPX trouvé." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "" "Impossible de trouver la primitive d’id {0} dans le jeu de données courant" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Primitive manquante" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Mettre à jour la sélection" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Met à jour la sélection de primitive depuis le serveur" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Envoyer tous les changements sur le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objets à ajouter :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objets à modifier :" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objets à supprimer :" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Charger ces changements ?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Envoyer les changements" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Aucun changement à envoyer." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Téléchargement" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Mise à jour des primitives" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchroniser {0} {1} seulement" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1594,17 +1818,17 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Conflit détecté" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "valeur inattendue retournée. Reçue {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1620,5 +1844,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1626,58 +1850,60 @@ "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"L’envoi vers le serveur a échoué car votre jeu " -"de
données courant ne rempli pas une condition préalable.
Le message " -"d’erreur est :
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Condition préalable non remplie" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Le chargement a échoué car une primitive que " -"vous
essayez de supprimer sur le serveur est déjà supprimée.

Le " -"message d’erreur est :
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitive déjà supprimée" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +msgstr "L’envoi a échoué.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "L’envoi vers l’API OSM a échoué" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Mise à jour des primitives" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Envoyer tous les changements sur le serveur OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" -"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " -"Internet." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objets à ajouter :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objets à modifier :" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1765,42 +1991,55 @@ msgstr "Avancer plus lentement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Téléchargement des données GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Données GPX téléchargées" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Données GPS brutes" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Téléchargement des données" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, fuzzy, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" +"Attention : exception ignorée car la tâche est annulée. Exception : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Aucune donnée importée" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Données OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Téléchargement de {0} de {1} ({2} restant(s))" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Envoi des données" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Les erreurs suivantes sont survenues durant le transfert :" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Erreurs durant le téléchargement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1818,21 +2057,21 @@ "ignorer.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Primitives supprimées ou déplacées" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Mode Suppression" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Supprimer les nœuds ou les chemins." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1840,5 +2079,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1849,781 +2088,23 @@ "supprimer tous les objets utilisant cet objet." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Dessiner" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Dessiner des nœuds" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Mode : Desssiner" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "sélectionné" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Ajouter un nœud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Ajouter un nœud au chemin." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Connecter le chemin existant au nœud" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Créer un nouveau nœud." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Sélectionner le nœud sous le curseur." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Ajouter un nouveau nœud au chemin." -msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Continuer le chemin à partir du dernier nœud." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Terminer le tracé." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Extruder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Créer des surfaces" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Extruder un chemin" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" -"Relacher le bouton de souris pour sélectionner les objets dans le rectangle." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Dessiner un rectangle de la taille souhaitée puis relacher le bouton de " -"souris." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Relacher le bouton de souris pour arrêter la rotation." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Déplacer un segment du chemin pour faire un rectangle." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Déplacer le curseur de lecture et le relacher à côté de la trace pour lire " -"la piste audio à partir d’ici; Maj+relachement pour synchroniser la piste " -"audio à ce point." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Sélectionner" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Sélectionner, déplacer et tourner des objets" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Ajouter et déplacer un nouveau nœud virtuel au chemin." -msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Relâcher le bouton de souris pour arrêter le déplacement. Ctrl pour " -"fusionner avec le nœud le plus proche." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Déplace les objets en les tirant ; Maj. pour ajouter à la sélection (Ctrl " -"pour basculer) ; Ctrl-Maj pour faire pivoter la sélection ; ou changer la " -"sélection" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoomer et déplacer la carte" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Zommer en déplaçant la souris bouton enfoncé ou Ctrl+ ou Ctrl+,; déplacer " -"avec Ctrl+bouton haut, gauche, bas ou droit; déplacement avec le bouton " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Recherche..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Rechercher des objets." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Aucune donnée chargée" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Entrer le texte à rechercher." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "remplacer la sélection" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "ajouter à la sélection" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "supprimer de la sélection" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "respecter la casse" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "expression régulière" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - clé 'type' avec n'importe quelle valeur. Essayez aussi " -"*=valeur, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Options spéciales :" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - objet avec l'ID spécifié" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - tous les objets modifiés" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - tous les objets sélectionnés" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - tous les objets incomplets" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - tous les objets non étiquetés" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expr - tous les enfants des objets satisfaisant " -"l'expression" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - tous les parents des objets satisfaisant " -"l'expression" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -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:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Utilisez ( et ) pour grouper des expressions" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Chercher" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Commencer la recherche" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Aucun résultat trouvé pour \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} résultats trouvés" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"L’expression régulière \"{0}\" a une erreur de syntaxe à l’offset {1}. " -"Détail de l’erreur :\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"La clé ne peut être vide lorsqu'un opérateur est utilisé. Exemple " -"d'utilisation : clé=valeur" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Type de primitive inconnue : {0}. Les valeurs autorisées sont node, way ou " -"relation" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Jeton inattendu : {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Arguments manquants pour le OU" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Arguments manquants pour le -" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Les parenthèses doivent être fermées." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations " -"sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : " -"10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Contact de {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Téléchargement..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Erreur d’analyse dans l’URL : \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Erreur de communication avec le serveur" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "enlever \"{0}\" de {1} \"{2}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Mettre {0}={1} pour {2}\"{3}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objet" -msgstr[1] "objets" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Enlever \"{0}\" pour {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Mettre {0}={1} pour {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Résoudre les conflits de coordonnées dans {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "impossible de résoudre un conflit non arbitré" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Supprimer {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Supprimer {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relation conflictuelle" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Supprimer de la relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Séparer le segment du chemin" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Vous êtes sur le point de supprimer des nœuds en dehors de la zone " -"téléchargée.
Cela peut poser problème car d'autres objets (que vous ne " -"voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Résoudre les conflits de suppression dans {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Déplacer" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nœud" -msgstr[1] "nœuds" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Suppression d’une primitive" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "suppression de la référence du chemin {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Attention : suppression du chemin {0} car le nombre de ses nœuds est " -"inférieur à 2. Il est actuellement de {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "suppression de la référence de la relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Résoudre les conflits de la liste des membres de la relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Séquence" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Résoudre les conflits de version de {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Appliquer ?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Les changements suivants aux propriétés du chemin sont suggérés après son " -"retournement pour préserver la consistence des données." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relation" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Ancien rôle" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nouveau rôle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Ancienne clé" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Ancienne valeur" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nouvelle clé" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nouvelle valeur" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Appliquer les changements sélectionnés" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Ne pas appliquer les changements" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Propriétés de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Rôles de la relation de référence" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Correction automatique d’étiquette" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -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:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Préférences sauvegardées sur {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Impossible de charger les préférences depuis le serveur." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2635,8 +2116,824 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "le paramètre \"{0}\" ne doit pas être vide" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Dessiner" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Dessiner des nœuds" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "Mode : Desssiner" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "sélectionné" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Ajouter un nœud" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Ajouter un nœud au chemin." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Connecter le chemin existant au nœud" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Créer un nouveau nœud." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Sélectionner le nœud sous le curseur." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Ajouter un nouveau nœud au chemin." +msgstr[1] "Ajouter un nouveau nœud aux {0} chemins." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Continuer le chemin à partir du dernier nœud." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Terminer le tracé." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Extruder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Créer des surfaces" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Extruder un chemin" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" +"Relacher le bouton de souris pour sélectionner les objets dans le rectangle." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Dessiner un rectangle de la taille souhaitée puis relacher le bouton de " +"souris." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Relacher le bouton de souris pour arrêter la rotation." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Déplacer un segment du chemin pour faire un rectangle." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Déplacer le curseur de lecture et le relacher à côté de la trace pour lire " +"la piste audio à partir d’ici; Maj+relachement pour synchroniser la piste " +"audio à ce point." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Sélectionner" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +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 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Ajouter et déplacer un nouveau nœud virtuel au chemin." +msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Déplacer des éléments" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Vous avez déplacer plus de {0} éléments. Le déplacement d'un aussi grand " +"nombre d'éléments is souvent une erreur.\n" +"Souhaitez vous les déplacer ?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Les déplacer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Annuler déplacer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Relâcher le bouton de souris pour arrêter le déplacement. Ctrl pour " +"fusionner avec le nœud le plus proche." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Déplace les objets en les tirant ; Maj. pour ajouter à la sélection (Ctrl " +"pour basculer) ; Ctrl-Maj pour faire pivoter la sélection ; ou changer la " +"sélection" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoomer et déplacer la carte" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Zommer en déplaçant la souris bouton enfoncé ou Ctrl+ ou Ctrl+,; déplacer " +"avec Ctrl+bouton haut, gauche, bas ou droit; déplacement avec le bouton " +"droit de la souris" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Recherche..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Rechercher des objets." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Entrer le texte à rechercher." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "remplacer la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "ajouter à la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "supprimer de la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "respecter la casse" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "expression régulière" + +#: ../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." + +#: ../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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - clé 'type' avec n'importe quelle valeur. Essayez aussi " +"*=valeur, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Options spéciales :" + +#: ../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: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 +msgid "modified - all changed objects" +msgstr "modified - tous les objets modifiés" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - tous les objets sélectionnés" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - tous les objets incomplets" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - tous les objets non étiquetés" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expr - tous les enfants des objets satisfaisant " +"l'expression" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - tous les parents des objets satisfaisant " +"l'expression" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +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: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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Chercher" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Commencer la recherche" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "{0} résultats trouvés" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"L’expression régulière \"{0}\" a une erreur de syntaxe à l’offset {1}. " +"Détail de l’erreur :\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"La clé ne peut être vide lorsqu'un opérateur est utilisé. Exemple " +"d'utilisation : clé=valeur" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Type de primitive inconnue : {0}. Les valeurs autorisées sont node, way ou " +"relation" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Jeton inattendu : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Arguments manquants pour le OU" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Arguments manquants pour le -" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Les parenthèses doivent être fermées." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations " +"sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : " +"10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Charger la sélection" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Contact de {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, 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 +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}" +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}''" +msgstr "enlever \"{0}\" de {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objet" +msgstr[1] "objets" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Enlever \"{0}\" pour {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Mettre {0}={1} pour {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Modifier le rôle du membre de la relation en {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Résoudre le conflit" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Aucun résultat trouvé pour \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " +"présent." + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Résoudre les conflits de coordonnées dans {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +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:584 +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?" +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:402 +msgid "Split way segment" +msgstr "Séparer le segment du chemin" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Vous êtes sur le point de supprimer des nœuds en dehors de la zone " +"téléchargée.
Cela peut poser problème car d'autres objets (que vous ne " +"voyez pas) pourraient les utiliser.
Voulez-vous vraiment les supprimer ?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Supprimer de la relation" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Résoudre les conflits de suppression dans {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Déplacer" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nœud" +msgstr[1] "nœuds" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Suppression d’une primitive" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "suppression de la référence du chemin {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Attention : suppression du chemin {0} car le nombre de ses nœuds est " +"inférieur à 2. Il est actuellement de {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "suppression de la référence de la relation {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "effectuer une rotation de {0}{1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Séquence" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Résoudre les conflits de version de {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "le jeu de données principal ne contient pas le noeud {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Appliquer ?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Les changements suivants aux propriétés du chemin sont suggérés après son " +"retournement pour préserver la consistence des données." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relation" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Ancien rôle" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nouveau rôle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Ancienne clé" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Ancienne valeur" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nouvelle clé" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nouvelle valeur" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Appliquer les changements sélectionnés" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Ne pas appliquer les changements" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Propriétés de " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +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 +msgid "Automatic tag correction" +msgstr "Correction automatique d’étiquette" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Préférences sauvegardées sur {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +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 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2664,5 +2961,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2671,27 +2968,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Erreur : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Attention : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "nœuds" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2699,13 +2996,13 @@ msgstr[1] "voies" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "chemins" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2713,22 +3010,22 @@ msgstr[1] "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relations" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../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:10 +#: ../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:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2742,23 +3039,23 @@ msgstr[1] "{0} membres" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "highway" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "voie ferrée" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "voie navigable" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "utilisation du terrain" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2816,5 +3113,5 @@ "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:230 +#: ../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." @@ -2957,9 +3254,4 @@ "contradiction. Je conserve ma primitive. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2976,5 +3268,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "arrière-plan" @@ -2985,8 +3277,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -3002,5 +3294,5 @@ "et démarrez un nouveau calque sur cette nouvelle zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert Zone (France)" @@ -3021,24 +3313,143 @@ #, java-format msgid "UTM Zone {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +msgstr "Zone UTM {0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Impossible de lire les marque-pages." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Impossible d’écrire un marque-page." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Ne plus afficher" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" +"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " +"Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"L’envoi vers le serveur a échoué car votre jeu " +"de
données courant ne rempli pas une condition préalable.
Le message " +"d’erreur est :
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Condition préalable non remplie" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "inconnu" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Exception inattendue" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Impossible de joindre le serveur OSM. Veuillez vérifier votre connectivité " +"Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"Impossible d’initialiser la communication avec le serveur OSM {0}.\n" +"Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion " +"Internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Hôte inconnu" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Le chargement a échoué car une primitive que " +"vous
essayez de supprimer sur le serveur est déjà supprimée.

Le " +"message d’erreur est :
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Primitive déjà supprimée" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, fuzzy, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" +"Attention : exception ignorée car la tâche est annulée. Exception : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Message du jour non disponible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- version utilisée {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Téléchargement du \"Message du jour\"" @@ -3121,64 +3532,57 @@ msgstr "Mot de passe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Impossible de trouver la traduction pour la langue {0}. Retour à la langue " -"{1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard UNIX" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Télécharge la zone sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Ouvrir fichier (données brutes gps, si .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Télécharger la zone sélectionnée en données GPS brut." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Lancer maximisé" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Définir la langue" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "exemples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3189,51 +3593,51 @@ "sur d’avoir chargé des données avant --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Au lieu de --download= vous devriez indiquer osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Activation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Balises" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3241,21 +3645,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Bascule vers l'affichage de la grille" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Basculer en mode plein écran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3299,53 +3703,68 @@ msgstr "échelle" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "La longitude géographique au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Le nom de l’objet au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "La latitude géographique au niveau du pointeur de souris." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "L'angle entre le segment de chemin précédent et l’actuel." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "L’orientation (boussole) du segment en train d’être dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(aucun objet)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "le calque n’est pas dans la liste." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contact du serveur OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "La couche \"{0}\" doit se trouver dans la liste des couches" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Erreur d’analyse" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3370,4 +3789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initialisation" @@ -3399,20 +3819,20 @@ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Étiquettes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3420,30 +3840,30 @@ msgstr "Nœuds" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Aucun conflit d’étiquette n'est résolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Étiquettes ({0} conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} étiquette(s) en conflit à résoudre" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Nœuds (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3452,17 +3872,17 @@ "la liste de nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Nœuds (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Membres (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3472,25 +3892,25 @@ "dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Membres (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Conflits à résoudre dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "Pas de conflit de propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Propriétés (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Des conflits de propriété sont en attente de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Résolution de conflits" @@ -3527,5 +3947,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Ma version" @@ -3536,5 +3956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3550,5 +3970,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Leur version" @@ -3636,7 +4056,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3714,14 +4133,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "le paramètre {0} ne peut pas être vide" @@ -3752,10 +4171,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "index de colonne inattendu. Reçu {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3766,19 +4185,19 @@ "serveur
Détails :{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "La communication avec le serveur a échoué" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Oui, les restaurer également" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Non, annuler l’opération" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3789,9 +4208,9 @@ "supprimés du serveur.

Voulez-vous les restaurer également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Restaurer ces nœuds également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3804,13 +4223,13 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Restaurer les primitives ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3820,90 +4239,90 @@ "éléments lorsque la fusion sera appliquée." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "État visible :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "non visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Garder une copie de la version locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Supprimer physiquement du jeu de données local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d'état" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Conserver mon état de visibilité" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Oui, réinitialiser l’id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Non, annuler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3916,5 +4335,5 @@ "id
Êtes-vous d'accord ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Réinitialisation de l’id à 0" @@ -3941,12 +4360,11 @@ msgstr "Suppression du jeu de données" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Conflit non résolu entre deux états de visiblité" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3994,10 +4412,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4006,10 +4424,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4018,5 +4436,5 @@ msgstr "Valeur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -4078,9 +4496,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4088,5 +4506,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4118,6 +4536,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4126,35 +4544,39 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Résoudre les conflits" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Annule la résolution de conflits et ferme la boite de dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Appliquer la résolution partielle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Continuer tout de même" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"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 "" "Vous n’avez pas fini de résoudre les conflits.
Cliquez {0}" +#: ../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 "Résoudre les conflits" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Résoudre les conflits de version de {0} {1}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 @@ -4179,98 +4614,132 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, 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:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Historique de l’objet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Afficher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Afficher l'historique de la primitive sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Calques" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Supprimer le calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "" "Il y a des changements non enregistrés. Supprimer le calque quand même ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Supprimer le calque" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Voulez-vous vraiment supprimer la totalité du calque ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Information" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "oui" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Supprimer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Supprimer {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Montrer/Cacher" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Bascule l'état de visibilité du calque sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Afficher/Masquer Texte/Icônes" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Bascule l'état de visibilté du marqueur de texte et d'icônes." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Calques" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privé" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Supprimer le calque sélectionné." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "" +"Fusionner le calque immédiatement en dessous avec le calque sélectionné." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 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/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "" -"Fusionner le calque immédiatement en dessous avec le calque sélectionné." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Calques: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Bureau d'informations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4279,22 +4748,28 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Une valeur vide supprime la clé." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4303,85 +4778,90 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Veuillez sélectionner une clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Veuillez sélectionner une valeur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Veuillez sélectionner les objets dont vous voulez changer les propriétés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Propriétés/Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Propriétés des objets sélectionnés." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Supprimer vraiment la sélection de la relation {0} ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Ajouter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Supprimer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" @@ -4390,63 +4870,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Supprimer la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relations : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Supprimer la relation sélectionnée" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Sélection actuelle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Ouvrir une fenêtre de liste de sélection." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zoomer sur le(s) élément(s) sélectionné(s)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Actualiser la liste de sélection." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoomer sur la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4455,5 +4937,5 @@ msgstr[1] "{0} voies" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4462,5 +4944,5 @@ msgstr[1] "{0} relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4471,5 +4953,10 @@ msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4478,145 +4965,428 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Auteurs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" "Ouvrir une liste des personnes travaillant sur les objets sélectionnés." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Auteur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Auteurs : {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "télécharger les membres de la relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Télécharger zone" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "télécharger les relations référentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Télécharger les tuiles visibles" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Conflits dans les données" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Aucune relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Téléchargement du greffon {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" +"Attention : exception ignorée car la tâche est annulée. Exception : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +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 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "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 "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Élément supprimé des relations" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" +"Ajouter toutes les primitives sélectionnées dans le jeu de données devant le " +"premier membre" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" +"Ajouter toutes les primitives sélectionnées dans le jeu de données après le " +"dernier membre" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Échec de la mise à jour des primitives sélectionnées." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "Éditeur de relation : supprimer la sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +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:907 +msgid "Relation Editor: Sort" +msgstr "éditeur de relation : trier" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +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:922 +msgid "Relation Editor: Move Up" +msgstr "Éditeur de relation : déplacer vers le haut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +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:941 +msgid "Relation Editor: Move Down" +msgstr "Éditeur de relation : déplacer vers le bas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Retirer tous les objets sélectionnés de la relation" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "éditeur de relation : supprimer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Supprimer la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Continuer la résolution" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +#, fuzzy +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" +"La relation a été modifiée en dehors de l'éditeur.
Votre " +"modification ne peut pas être appliquée directement, un conflit a été créé à " +"la place." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Conflits dans les données" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Sauvegarder les données actuelles." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Appliquer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "Appliquer les changements et fermer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "Annuler les changements et fermer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Ajouter une étiquette vide" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Supprimer les étiquettes sélectionnées" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +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:1263 +msgid "Download Members" +msgstr "Télécharger les membres" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "Éditeur de relation : télécharger les membres" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +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:1285 +msgid "Apply Role" +msgstr "Appliquer le rôle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Oui, le supprimer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Confirmer l’action Remote Control" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" +"Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre " +"d'édition" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zoom arrière" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Déplacer les membres sélectionnés vers le bas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Se rapporte à" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "Lié" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "télécharger les relations référentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "Charger les relations parentes" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "éditer la relation sélectionnée" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Appliquer les modifications" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Basique" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Occupé par" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "lié" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Déplacer vers le haut" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Déplacer les membres sélectionnés vers le haut" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Ajouter la sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Ajouter les objets sélectionnés en tant que membres" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Supprimer la sélection" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Retirer tous les objets sélectionnés de la relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Déplacer vers le bas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Déplacer les membres sélectionnés vers le bas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Supprimer le membre de cette relation de l'entrée actuelle de la table" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Télécharger les membres" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editeur de relation : {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Il y a eu {0} conflits durant l'import." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "créer une nouvelle relation dans la couche \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "éditer la nouvelle relation dans la couche \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "éditer la relation #{0} dans la couche \"{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Charger la sélection" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +#, fuzzy +msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "" +"Attention : exception ignorée car la tâche est annulée. Exception : {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4625,5 +5395,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4633,25 +5403,22 @@ msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Mise à jour de propriétés d'au maximum {0} objet" -msgstr[1] "Mise à jour de propriétés d'au maximum {0} objets" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Marque-pages" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Entrer les coordonnées désirées en premier." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Entrer un nom pour cet emplacement." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Changer de lieu" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Sélectionner un marque-page en premier." @@ -4686,17 +5453,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Sources et types de données" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Télécharger en tant que nouveau calque" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Télécharger zone" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4704,5 +5471,5 @@ "le serveur" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4711,13 +5478,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Erreur de pointeur nul, des étiquettes sont peut-être manquantes." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Veuillez saisir une chaîne de caractères pour la recherche" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "" @@ -4726,5 +5493,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Entrez un nom d’endroit à rechercher :" @@ -4732,5 +5499,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4738,6 +5505,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nom" @@ -4776,6 +5543,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4798,15 +5565,15 @@ msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "à côté de" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4815,5 +5582,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Carte glissante" @@ -4845,5 +5612,11 @@ msgstr "Historique de {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Fermer la boîte de dialogue" @@ -5595,5 +6368,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5762,59 +6535,59 @@ msgstr "Version" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Images pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Lecture GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Aucune heure pour le point {0}·x·{1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Aucune image avec des informations horaires lisibles trouvée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lecture de {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Images géolocalisées" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Allumage du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Extinction du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "variation différentielle actuelle : {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "différence de fuseau horaire : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5822,138 +6595,128 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} dans la trace." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synchroniser l’horloge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "images JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synchroniser l’heure avec l’instrument GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "La date indiquée ne peut être analysée." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "point GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personnaliser le dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Utiliser les réglages généraux." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Dessiner des lignes entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Ne pas dessiner de ligne entre les points pour ce calque." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Sélectionner les options de dessin des lignes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personnaliser la couleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Par défaut" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Choisir une couleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Marqueurs depuis des points nommés" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Points de parcours nommés depuis {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importer Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Fichiers audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Marqueurs audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importer des images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5962,5 +6725,5 @@ msgstr[1] "{0} traces, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5969,5 +6732,5 @@ msgstr[1] "{0} chemins, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5976,30 +6739,30 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nom : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Description : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Intervalle de temps : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Longueur : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Convertir en calque de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -6010,43 +6773,43 @@ "regardez ici :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Converti depuis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Télécharger depuis OSM le long de cette trace" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Tout télécharger dans un rayon de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} mètres" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Aire maximale par requête:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -6057,5 +6820,5 @@ "Voulez-vous
continuer ?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -6063,5 +6826,5 @@ "audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6071,5 +6834,5 @@ "chemin ont été omis ou déplacés au début." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6079,19 +6842,19 @@ "estimer leur horodatage ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Couche de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -6099,29 +6862,29 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6146,5 +6909,5 @@ msgstr[1] "traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6152,5 +6915,5 @@ msgstr[1] "points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6159,5 +6922,5 @@ msgstr[1] "une trace avec {0} points" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6166,5 +6929,5 @@ msgstr[1] "{0} est constitué de {1} traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6183,5 +6946,5 @@ msgstr[1] "marqueurs" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6190,9 +6953,9 @@ msgstr[1] "{0} est constitué de {1} marqueurs" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synchronizer l’audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6201,20 +6964,20 @@ "de synchronisation." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Fichier audio synchronisé au point {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Impossible de synchroniser dans le calque actuellemnt lu." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Créer un marqueur audio au niveau de la tête de lecture" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6224,5 +6987,5 @@ "voulez le marqueur." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" @@ -6230,6 +6993,13 @@ "décalage ." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Afficher/Masquer Texte/Icônes" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +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 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6239,5 +7009,5 @@ "laquelle vous voulez l'associer (après le premier marqueur)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6247,29 +7017,29 @@ "marqueur audio ou sur le point de la trace où vous voulez synchroniser." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Impossible de créer un nouveau marqueur audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "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:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(L’URL était : " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Erreur à l'affichage de l'URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Configuration avancée" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Régler les préférences directement. À utiliser avec précaution !" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6277,14 +7047,14 @@ msgstr "Rechercher : " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "La valeur actuelle est par défaut." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "La valeur par défaut est \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6292,13 +7062,13 @@ "été utilisé)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Veuille sélectionnez la rangée à éditer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6306,14 +7076,14 @@ msgstr "Nouvelle valeur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Veuillez sélectionnez la rangée à supprimer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Entrez une nouvelle paire clé/valeur" @@ -6459,40 +7229,40 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Couleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Style de rendu {0} : {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Couche : {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Choisir" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Choisir une couleur pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Mettre la valeur par défaut" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Réinitialiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Couleurs utilisées par les différents objets dans JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Couleurs" @@ -6844,48 +7614,57 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "style utilisé" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configurer les greffons disponibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Télécharger la liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Actualiser" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configurer les sites..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Ajouter une description à l'URL des greffons de JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Veuillez sélectionner une entrée." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Modifier la description de l'URL des greffons de JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Ajouter une description à l'URL des greffons de JOSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Configurer les sites de greffon." #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Réglages de l’affichage" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6893,30 +7672,30 @@ msgstr "Divers réglages de l’apparence de tout le programme." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Réglages de connexion" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Paramètres de connexion du serveur OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Réglages de la carte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "" "Réglages pour la projection de la carte et l’interprétation des données." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Paramètres Audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Réglages pour le lecteur et les marqueurs audios." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet." @@ -7022,61 +7801,65 @@ msgstr "Raccourci" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +msgstr "Description brève : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +msgstr "URL: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +msgstr "auteur : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +msgstr "page web : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgstr "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 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Chemins des icônes" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +msgstr "Copier les valeurs par défaut" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Veuillez sélectionner la colonne à copier" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "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 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:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" +"Paramètres par défaut (voir info-bulle pour obtenir des informations " +"détaillées)" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38 @@ -7263,33 +8046,33 @@ msgstr "Touches de raccourcis" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Plus d'informations à propos de cette balise" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Attributs optionnels:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Utiliser la balise \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "voie sans issue" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7300,15 +8083,15 @@ msgstr "Impossible de lire la source des balises prédéfinies : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Erreur de traitement {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Les éléments de type {0} sont avalisés." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7318,18 +8101,18 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Changer les propriétés" @@ -7340,27 +8123,21 @@ msgstr "Groupe de balises \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Contact du serveur OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Téléchargement des points {0} à {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Téléchargement des données OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "" @@ -7368,7 +8145,16 @@ "manquantes." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Préparation des données..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Impossible de lire \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7376,21 +8162,21 @@ msgstr "Fichiers GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Marqueurs de {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Le fichier \"{0}\" n'existe pas" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7410,5 +8196,19 @@ "déduire le type de primitive" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -7416,5 +8216,10 @@ "Le serveur a répondu avec une erreur 404 pour l’id {0}. Passage au suivant." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7424,48 +8229,47 @@ "requêtes individuelles pour chaque primitive" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Fichiers NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordonnées importées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Phrases malformées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Erreurs de syntaxe : " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Phrases inconnues : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Pas de coordonnées : " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Succès de l'import des trames NMEA" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Erreur lors de l'import des trames NMEA !" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7476,5 +8280,5 @@ "supporte que les versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" @@ -7482,10 +8286,10 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7495,34 +8299,47 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Ouverture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Envoi en cours..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Parcours du dossier {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Code={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Le serveur a renvoyé une erreur avec le code {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7555,9 +8372,4 @@ msgstr "Identifiant" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Interruption en cours..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7619,43 +8431,47 @@ "OsmPrimitiveType, reçu \"{1}\"" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "Scrutation des données de l'historique d'OSM..." + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Erreur pendant l’analyse syntaxique." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Fichiers du serveur OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Version inconnue" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Il manque le numéro de version dans les données OSM." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Version inconnue : {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Élément trouvé sur un non-chemin." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " n’a pas de ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Élément trouvé dans une non-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" @@ -7664,10 +8480,10 @@ "valeur {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." @@ -7676,13 +8492,13 @@ "valeur {2}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Champ incomplet avec ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "L’objet avec l’id=0 est illégal" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7692,46 +8508,66 @@ "valeur {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Attribut requis manquant \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Préparation des données de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "id du nœud mal formé" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "Téléchargement des chemins référents ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Téléchargement de l’historique" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Contact du serveur..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Echec de l’ouverture de connexion à l’API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7740,5 +8576,18 @@ "Internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7747,16 +8596,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Mise à jour des greffons" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Télécharger les greffons" @@ -7773,5 +8617,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7780,23 +8624,23 @@ msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Téléchargement du greffon {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Annuler le téléchargement" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Version {0} de JOSM requise pour le greffon {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Télécharger le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Annuler le téléchargement" @@ -7807,34 +8651,32 @@ msgstr "Une erreur est survenue dans le greffon {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Attention - le chargment de {0} greffon a été demandé. Ce greffon n’est plus " "nécessaire." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Greffon non trouvé : {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "La dernière mise à jour du greffon date de plus de {0} jours." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7845,21 +8687,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Désactiver le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Garder le greffon" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7869,5 +8711,5 @@ "l’autorisation de remplacer les greffons existants." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7876,10 +8718,10 @@ "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "D’après les informations du greffon, l’auteur est {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7888,9 +8730,9 @@ "d'extension avant de rapporter un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Ce module d'extension doit-il être désactivé ?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7900,27 +8742,23 @@ "greffon ne soit plus chargé." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Le greffon ne peut pas être supprimé. Merci de le signaler là où vous avez " -"obtenu JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Information" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Pas d'information sur les greffons trouvée." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Aucune description disponible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Plus de détails" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7929,13 +8767,18 @@ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Pas d'information sur les greffons trouvée." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Tous les greffons installés sont à jour." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7948,9 +8791,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Télécharger les greffons manquants" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7963,57 +8806,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "inconnu" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Greffon intégré à JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Erreur à la lecture du fichier d’information du greffon : {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Ceci est après la fin de l’enregistrement" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Erreur lors de la lecture du son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ne rien faire" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Signaler une erreur" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -8028,14 +8849,14 @@ "rapport d'erreur." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Exception inattendue" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Veuillez rapporter un billet à {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8043,5 +8864,5 @@ "que possible) !" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8051,17 +8872,35 @@ "rapporter un bogue." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Soyez sûr(e) d'inclure l'information suivante :" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Ce texte a déjà été copié dans votre presse-papier.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Ne plus afficher" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"Impossible de trouver la traduction pour la langue {0}. Retour à la langue " +"{1}." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -8074,5 +8913,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -8082,5 +8921,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -8091,14 +8930,29 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" "(Astuce : Vous pouvez modifier les raccourcis-clavier dans les préférences.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Créer un reseau de voies" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8108,21 +8962,21 @@ "point en commun." -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Séléctionnez deux voies ayant un même noeud en commun" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Sélectionner deux chemins avec un seul nœud en commun" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Créer un reseau de voies" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Envoyer la trace" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8130,74 +8984,75 @@ msgstr "Charger les traces" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Public" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Cette sélection rend votre trace publique dans openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Veuillez saisir une description de votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Veuillez entrer des mot-clés liés à votre trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Trace sélectionnée : {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Connexion..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Envoi annulé" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Erreur lors du chargement" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Succès de l'envoi de la trace GPX" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "L'envoi a échoué. Le serveur a retourné le message suivant : " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Envoyer la trace GPX : {0}% ({1} ou {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Pas de description fournie. Merci de fournir une description." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Pas de calque GPX sélectionné. Impossible de téléverser une trace." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Pas de nom d'utilisateur fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Pas de mot de passe fourni." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Envoyer la trace GPX" @@ -8267,33 +9122,34 @@ msgstr "Un des fichiers sélectionnés était vide !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Lexture des images..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Parcours du dossier {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fichier vide trouvé dans le dossier {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Corréler en GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8313,15 +9169,15 @@ msgstr "Fichiers GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Erreur pendant le traitement {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8333,34 +9189,34 @@ "hpoto et sélectionnez un fuseau horaire.
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Heure de la photo (information EXIF) :" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Heure du GPS (lu sur la photo) : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [jj/mm/aaa hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Je suis dans le fuseau horaire de : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Aucune date" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Ouvrez une autre photo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchroniser l’heure avec une photo du GPS" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8370,29 +9226,29 @@ "Merci d’utiliser le format demandé" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Date non valide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Trace GPX : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Ouvrir une autre trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Fuseau horaire : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Décallage :" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8400,41 +9256,41 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Mettre à jour la position pour : " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Toutes les images" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Images sans position EXIF" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Images non encore étiquetées" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Correler les images avec la trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Corréler" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Estimation automatique" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Vous devez sélectionner une trace GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Aucune trace GPX sélectionnée" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8445,9 +9301,9 @@ "Format attendu : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Fuseau horaire invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8458,27 +9314,27 @@ "Format attendu : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Décallage invalide" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Trace GPX chargée" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" "Les photos sélectionnées ne contiennent pas d'information d'horodatage." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Les photos ne contienne tpas d'information d'horodatage" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8487,39 +9343,39 @@ "autre." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "La trace GPX n'a pas d'horodatage." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Fuseau horaire : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minutes : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Secondes : {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Différence de temps de {0} jours)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Différence entre la trace et les photos : {0}min. {1}sec." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8530,13 +9386,13 @@ "manuellement." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 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:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Ajuster le fuseau horaire et le décalage" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valeurs par défaut" @@ -8558,5 +9414,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" @@ -8579,6 +9435,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber : url illégale." @@ -8769,22 +9625,22 @@ msgstr "Ajouter \"source=...\" aux éléments ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Téléchargement {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Contact du serveur WMS..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Créer les bêtiments" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8794,18 +9650,18 @@ "l'import des bâtiments est limité à 1km2 max." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Extraire le ViewBox du SVG" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Extraction des meilleures limites..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Créer la frontière" @@ -8925,6 +9781,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Calque vide" @@ -8953,5 +9809,5 @@ msgstr "Zone de délimitation de la commune : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8962,9 +9818,9 @@ "Veuillez en créer un nouveau." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Erreur de format du tampon" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -8973,5 +9829,5 @@ "courante" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Erreur de tampon de zone Lambert" @@ -9047,5 +9903,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "fichiers TCX (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -9062,4 +9918,9 @@ msgstr "Impossible de dupliquer un chemin non ordonné" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Aucune donnée chargée" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -9070,9 +9931,9 @@ msgstr "Créer un chemin dupliqué" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Couche d'édition des traces GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Convertir en couche GPX en rendant anonyme l'horodatage" @@ -9194,30 +10055,30 @@ msgstr "supprimer les données après l’import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importer des données depuis le GPS" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Import des données du DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Erreur lors de la suppression des données" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Données importées depuis {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Pas de données sur le périphérique" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "La connexion a échoué." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9229,10 +10090,10 @@ "raphael-mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Importer depuis Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "" @@ -9240,5 +10101,5 @@ "GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importer" @@ -9329,40 +10190,40 @@ msgstr "Ouvrir les images avec ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Index de direction '{0}' non trouvé" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "L'emplacement de départ n'est pas à l'intérieur de la bbox" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Recherche de ligne côtière..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} nœuds jusqu'à présent..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Erreur lors de la création du répertoire tampon : {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Suivi" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "Vérification du cache..." @@ -9371,26 +10232,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Exécution de la réduction Vertex" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Exécution de l'approximation de Douglas-Peucker" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Suppression des nœuds en doublon..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Trace Lakewalker" @@ -9475,7 +10328,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "eau" @@ -9635,9 +10488,9 @@ msgstr "Préférences du greffon LakeWalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Téléchargement de la tuile..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Impossible d'acquérir l'image" @@ -9893,18 +10746,18 @@ msgstr "Etat du problème inconnu" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Open Visible..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Ouvrir uniqueent les fichiers visibles sur la vue actuelle." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Aucune vue ouverte - impossible de déterminer la zone !" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9931,34 +10784,34 @@ msgstr "Exécutable Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "chargement des données depuis l’API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "Changer la sélection" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "changer le viewport" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "confirmez toutes les actions Remote Control manuellement" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" "Un greffon permettant à JOSM d’être contrôlé par d’autres applications." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Réglages du greffon Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9970,28 +10823,28 @@ "dialogant avec le greffon." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Actions permises" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Il a été demandé à Remote Control de charger les données depuis l'API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Request details: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Voulez-vous permettre celà?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Confirmer l’action Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -10002,13 +10855,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "éditer la relation" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "éditer les relations" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Aucune relation sélectionnée" #. Add menu @@ -10122,5 +10975,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "image " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10257,4 +11110,25 @@ msgid "Highlight" msgstr "Surligner" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Mise à jour de propriétés d'au maximum {0} objet" +msgstr[1] "Mise à jour de propriétés d'au maximum {0} objets" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10516,34 +11390,34 @@ "Ouvre une boite de dialogue permettant de se rendre à une position spécifique" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Entrez la Lat./Long. pour vous rendre à la position." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Vous pouvez aussi coller une URL de www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (en mètres)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Aller ici" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Aller à la position" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Impossible d'analyser la Latitude, Longitude ou le Zoom. Veuillez vérifier." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Analyse syntaxique de la Lat./Lon. impossible" @@ -10577,6 +11451,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Erreurs de validation" @@ -10586,10 +11460,10 @@ msgstr "Aucune erreur de validation" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Grille" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10682,24 +11556,15 @@ msgstr "Validation des données" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Les données contiennent des erreurs. Envoyer quand même ?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Ouvrir la fenêtre de validation." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoomer sur le problème" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Valider" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "" -"Valider soit la sélection actuelle, soit toutes les données téléchargées." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10772,23 +11637,23 @@ msgstr "Chemins se croisant" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Nœuds dupliqués" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" "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/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Nœuds du chemin dupliqués." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Vérifie si les chemins contiennent des nœuds consécutifs identiques." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Nœuds du chemin dupliqués" @@ -10868,23 +11733,23 @@ "mal ortographiés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Vérificateur de propriétés :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Erreur d’orthographe ligne : {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10895,7 +11760,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Combinaisons étiquette/valeur non valide" @@ -10903,43 +11768,43 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problème de rendu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Clé \"{0}\" non valide." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Étiquettes avec des valeurs vides" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Clé de propriété invalide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "espace blanc dans une clé non valide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Les valeurs commencent ou finissent par un espace blanc" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Les valeurs contiennent du code HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Les balises ne contiennent pas de propriété" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." @@ -10947,37 +11812,39 @@ "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 +#: ../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:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Vérifier les clés de propriétés." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" "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:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 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:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 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:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Source de TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10988,21 +11855,21 @@ "données de vérification des étiquettes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Ajouter une nouvelle source à la liste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Modifier la source sélectionnée." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Sources de données" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Vérifier les valeurs des propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -11010,9 +11877,9 @@ "prédéfinies." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Vérifier les FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -11020,54 +11887,54 @@ "étiquette." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Vérifier les notes de rendu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Vérifier si le rendu de carte a généré des erreurs." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Utiliser le fichier de données par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Utiliser le fichier de données par défaut (recommandé)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Utiliser la vérification orthographique par défaut." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Corriger les propriétés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Impossible de trouver le type element" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Impossible de trouver le niveau d’avertissement" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Expression interdite \"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11212,7 +12079,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "bâtiment" @@ -11226,5 +12093,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "zone" @@ -11259,10 +12126,10 @@ msgstr "point final d’un chemin connecté à côté d’un autre chemin" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Nœud non connectés et sans étiquettes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11321,8 +12188,32 @@ msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11333,10 +12224,10 @@ msgstr "Sélectionner le nœud de départ à la fin d'un chemin" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Fin de la ligne atteinte" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Intersection atteinte" @@ -11408,14 +12299,14 @@ msgstr "Aide sur le greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Rectifier l'image..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Télécharge des images rectifiées depuis différents services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11426,26 +12317,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Lien WMS Personalisé" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Services de rectification supportés :" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Visiter la page d'accueil" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "URL WMS ou i d’image :" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Ajouter l'Image rectifiée" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11455,5 +12346,5 @@ "Veuillez réessayer." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Pas d’URL WMS valide ou d’id" @@ -11463,5 +12354,5 @@ msgstr "Ajuster la position du calque WMS sélectionné" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11472,19 +12363,19 @@ "Cela peut amener à de mauvaises coordonnées." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Téléchargement automatique" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Calque WMS ({0}), téléchargement au zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11493,37 +12384,37 @@ "résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Sauvegarder la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Charger la couche WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -11532,52 +12423,52 @@ "attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Préférences du greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" "Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nom du menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Nom du menu (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "URL de WMS (Défaut)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 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:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copier défaut" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11702,11 +12593,16 @@ "DG100 directement dans JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Fourni une couche d'arrière plan affichant une grille" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11719,10 +12615,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Aide à vectoriser des images WMS." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11732,5 +12628,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11744,5 +12640,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11755,15 +12651,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Affiche une image d'arrière plan provenant d'OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importe les erreurs d'OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11773,5 +12669,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11781,5 +12677,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11790,15 +12686,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "L'apparence et le ressenti du superbe JGoodies Plastic" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Permet aux autres applications d'envoyer des commandes vers JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11807,10 +12703,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Fournit des capacités de routage/calcul d'itinéraire" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11821,10 +12717,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -11833,5 +12729,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11844,10 +12740,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Crée des maisons mytoyennes depuis des blocs entiers." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11859,5 +12755,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11868,5 +12764,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11877,11 +12773,18 @@ "intégré pour le champ ’description’." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Téléchargement facile le long de plusieurs chemins interconnectés" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -13038,58 +13941,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -13103,6 +13954,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorway" @@ -13128,6 +13979,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "voie rapide" @@ -13153,6 +14004,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "primary" @@ -13178,6 +14029,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "secondary" @@ -13191,5 +14042,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "tertiary" @@ -13207,5 +14058,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "residential" @@ -13239,6 +14090,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "service" @@ -13265,6 +14116,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "construction" @@ -13314,5 +14165,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "roundabout" @@ -13362,5 +14213,5 @@ #: build/trans_presets.java:471 msgid "Pedestrian" -msgstr "Pédestre" +msgstr "Rue Piétonne" #. item @@ -14291,5 +15142,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "marais" @@ -16020,27 +16871,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18879,7 +19730,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "vélo/bicyclette" @@ -18949,7 +19800,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "piéton" @@ -18975,5 +19826,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "métro" @@ -19464,13 +20315,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "déprécié" @@ -19512,5 +20363,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "cheval" @@ -19730,4 +20581,66 @@ msgstr "barrière" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Route à accès réglementé" + #. color tertiary #. @@ -19762,6 +20675,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "rue" @@ -19817,7 +20730,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "piste" @@ -19873,8 +20786,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "voie ferrée" @@ -19895,5 +20808,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "services" @@ -19907,5 +20820,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "Ford" @@ -19926,5 +20839,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "zone de manœuvre" @@ -19939,5 +20852,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "Accès d'urgence" @@ -19952,5 +20865,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "berge" @@ -19964,5 +20877,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "ruisseau" @@ -19976,5 +20889,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "dock" @@ -20002,5 +20915,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "aqueduc" @@ -20168,13 +21081,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "artificiel" @@ -20236,7 +21149,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "point ferroviaire" @@ -20259,10 +21172,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "Autre voie ferrée" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "passage au dessus d'une voie ferrée" @@ -20298,7 +21211,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "ligne ferroviaire touristique" @@ -20343,6 +21256,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "piste d'atterrissage" @@ -20356,5 +21269,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20376,5 +21289,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "piste (sombre)" @@ -20388,5 +21301,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "piste (claire)" @@ -20434,7 +21347,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "couloir aérien" @@ -20451,5 +21364,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "piste bleue" @@ -20464,5 +21377,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "piste rouge" @@ -20477,5 +21390,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "piste noire" @@ -20490,5 +21403,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "piste_orange" @@ -20503,5 +21416,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "hors piste" @@ -20516,5 +21429,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "piste verte" @@ -20619,10 +21532,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "alimentation électrique" @@ -20636,5 +21549,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "appontement/jetée" @@ -20648,5 +21561,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "oléoduc" @@ -20774,12 +21687,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "loisir" @@ -20793,5 +21706,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20863,8 +21776,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "aménité" @@ -20966,10 +21879,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "équipement de traffic" @@ -21355,22 +22268,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "équipement lumineux" @@ -21402,6 +22315,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "eau (claire)" @@ -21462,8 +22375,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "santé" @@ -21816,26 +22729,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "magasin" @@ -21907,8 +22820,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hôtel" @@ -22058,9 +22971,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "tourisme" @@ -22132,8 +23045,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "patrimoine" @@ -22204,8 +23117,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "espace vert" @@ -22219,5 +23132,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "carrière" @@ -22231,5 +23144,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "décharge" @@ -22251,5 +23164,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "bassin" @@ -22263,5 +23176,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "forêt" @@ -22275,5 +23188,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "bâtiments de ferme" @@ -22296,5 +23209,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "commerce de proximité" @@ -22308,5 +23221,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "zone industrielle" @@ -22320,5 +23233,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "terrain en friche" @@ -22332,5 +23245,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "espace vert" @@ -22344,5 +23257,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "zone ferroviaire" @@ -22399,7 +23312,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "zone militaire" @@ -22413,5 +23326,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cimetière" @@ -22424,5 +23337,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "sommet" @@ -22437,5 +23350,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "glacier" @@ -22449,5 +23362,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "volcan" @@ -22502,8 +23415,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "nature" @@ -22517,5 +23430,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "broussailles" @@ -22529,5 +23442,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "lande/bruyère" @@ -22541,5 +23454,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "bois" @@ -22553,5 +23466,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "terrain boueux/vase" @@ -22565,5 +23478,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "plage" @@ -22641,8 +23554,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "route" @@ -22690,7 +23603,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "frontière" @@ -22832,10 +23745,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "lieu" @@ -22883,6 +23796,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adresse" @@ -23148,15 +24061,15 @@ #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -23179,10 +24092,56 @@ msgstr "Terraserver Urbain" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard." + +#~ msgid "API initialization failed" +#~ msgstr "Échec d’initialisation de l’API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une " +#~ "couche de données ?" + +#~ msgid "No data" +#~ msgstr "Aucune donnée" + +#~ msgid "Update failed" +#~ msgstr "La mise à jour a échoué" + +#~ msgid "Missing primitive" +#~ msgstr "Primitive manquante" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Appliquer la résolution partielle" + +#~ msgid "Layers: {0}" +#~ msgstr "Calques: {0}" + +#~ msgid "Conflict created" +#~ msgstr "conflit créé" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "" +#~ "Supprimer le membre de cette relation de l'entrée actuelle de la table" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous " +#~ "avez obtenu JOSM." + +#~ msgid "Validate" +#~ msgstr "Valider" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "" +#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées." + #~ msgid "Data Layer" #~ msgstr "Calque de données" -#~ msgid "Uploading data" -#~ msgstr "Envoi des données" - #~ msgid "Not implemented yet." #~ msgstr "Pas encore implémenté." @@ -23193,7 +24152,4 @@ #~ msgid "Resolve Conflicts" #~ msgstr "Résoudre les conflits" - -#~ msgid "There were conflicts during import." -#~ msgstr "Il y a eu des conflits pendant l’importation." #~ msgid "Object" @@ -23214,12 +24170,6 @@ #~ msgstr "version choisie :" -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nom d’utilisateur (e-mail) du compte OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Nom d’utilisateur OSM (courriel)" - -#~ msgid "Unknown host" -#~ msgstr "Hôte inconnu" +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contact du serveur OSM..." #~ msgid "position" @@ -23241,72 +24191,18 @@ #~ msgstr "Changer" -#~ msgid "Click Reload to refresh list" -#~ msgstr "Cliquer sur Recharger pour rafraîchir la liste" - -#~ msgid "Revert" -#~ msgstr "Rétablir" +#~ msgid "unnamed" +#~ msgstr "sans-nom" + +#~ msgid "Occupied By" +#~ msgstr "Occupé par" + +#~ msgid "Cannot connect to server." +#~ msgstr "Impossible de se connecter au serveur." #~ msgid "Date" #~ msgstr "Date" -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Rétablir l’état des objets actuellement sélectionnés à la version " -#~ "préalablement sélectionnée dans la liste de l’historique." - -#~ msgid "Rotate" -#~ msgstr "Pivoter" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" - -#~ msgid "Error parsing server response." -#~ msgstr "Erreur d'analyse de la réponse du serveur" - -#~ msgid "Cannot connect to server." -#~ msgstr "Impossible de se connecter au serveur." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et " -#~ "faire glisser." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." - -#~ msgid "Tagging preset source" -#~ msgstr "Source de balises prédéfinies" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste." - -#~ msgid "Tagging preset sources" -#~ msgstr "Sources des balises prédéfinies" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone " -#~ "à charger, et/ou attendez un peu avant de recommencer." - -#~ msgid "Commit comment" -#~ msgstr "Commentaire sur cette déposition" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Greffon mis à jour avec succès. Veuillez redémarrer JOSM." -#~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Impossible de télécharger le greffon : {0} de {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "image not loaded" -#~ msgstr "image non chargée" +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" #~ msgid "" @@ -23323,57 +24219,68 @@ #~ msgstr "rectifier id={0}" -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Ajuster la position du calque WMS" +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO·(GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO·(GNOME·Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO·(WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." + +#~ msgid "Add Selected" +#~ msgstr "Ajouter la sélection" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Greffon mis à jour avec succès. Veuillez redémarrer JOSM." +#~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Impossible de télécharger le greffon : {0} de {1}" + +#~ msgid "Rotate" +#~ msgstr "Pivoter" + +#~ msgid "Error parsing server response." +#~ msgstr "Erreur d'analyse de la réponse du serveur" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Certains points sont (presque) sur la ligne" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Marquer ce problème comme \"fait\"?" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importer un fichier TCX comme une trace GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Importer un fichier TCX..." + +#~ msgid "image not loaded" +#~ msgstr "image non chargée" #~ msgid "Charge" #~ msgstr "Charge" -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO·(GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO·(GNOME·Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO·(WebKit)" +#~ msgid "Drawbridge" +#~ msgstr "Pont-levis" #~ msgid "Server does not support changesets" #~ msgstr "Le serveur ne supporte pas les révisions" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Le greffon est déjà installé" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Impossible de supprimer le fichier du greffon : {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Certains points sont (presque) sur la ligne" - -#~ msgid "Drawbridge" -#~ msgstr "Pont-levis" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Haut Palatinat Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Marquer ce problème comme \"fait\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Importer un fichier TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importer un fichier TCX comme une trace GPS" #~ msgid "" @@ -23386,12 +24293,4 @@ #~ "serveur, encodé dans l’URL.
N’utilisez pas un mot de passe de " #~ "valeur." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des " -#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/" -#~ "TaggingPresets pour plus d'informations" #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -23493,4 +24392,13 @@ #~ "Ouvrir la fenêtre OpenStreetBugs et activer le téléchargement automatique" +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n" + +#~ msgid "Plugin already exists" +#~ msgstr "Le greffon est déjà installé" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Impossible de supprimer le fichier du greffon : {0}" + #~ msgid "sports" #~ msgstr "Magasin de sport" @@ -23502,4 +24410,17 @@ #~ "{1}" +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone " +#~ "à charger, et/ou attendez un peu avant de recommencer." + +#~ msgid "Remove Selected" +#~ msgstr "Supprimer la sélection" + +#~ msgid "Basic" +#~ msgstr "Basique" + #~ msgid "Delete and Download" #~ msgstr "Supprimer et télécharger" @@ -23508,6 +24429,61 @@ #~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié." -#~ msgid "Solve Conflict" -#~ msgstr "Résoudre le conflit" +#~ msgid "Commit comment" +#~ msgstr "Commentaire sur cette déposition" + +#~ msgid "Aborting..." +#~ msgstr "Interruption en cours..." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et " +#~ "faire glisser." + +#~ msgid "There were conflicts during import." +#~ msgstr "Il y a eu des conflits pendant l’importation." + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Ajouter les objets sélectionnés en tant que membres" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Cliquer sur Recharger pour rafraîchir la liste" + +#~ msgid "Revert" +#~ msgstr "Rétablir" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Rétablir l’état des objets actuellement sélectionnés à la version " +#~ "préalablement sélectionnée dans la liste de l’historique." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nom d’utilisateur (e-mail) du compte OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Nom d’utilisateur OSM (courriel)" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki." + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Ajuster la position du calque WMS" + +#~ msgid "Move Down" +#~ msgstr "Déplacer vers le bas" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editeur de relation : {0}" + +#~ msgid "Move Up" +#~ msgstr "Déplacer vers le haut" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Cette action va nécessiter {0} requêtes de téléchargement. Souhaitez-vous " +#~ "continuer ?" #~ msgid "" @@ -23517,11 +24493,4 @@ #~ "Veuillez sélectionner au moins un nœud, chemin ou relation. Seuls les " #~ "éléments déjà chargés ont un historique." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Cette action va nécessiter {0} requêtes de téléchargement. Souhaitez-vous " -#~ "continuer ?" #~ msgid "" @@ -23543,13 +24512,23 @@ #~ msgstr "Modifier une herse" +#~ msgid "Tagging preset source" +#~ msgstr "Source de balises prédéfinies" + +#~ msgid "Tagging preset sources" +#~ msgstr "Sources des balises prédéfinies" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "Les sources (URL ou nom de fichier) des fichiers de définitions des " +#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets pour plus d'informations" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste." + #~ msgid "Helppage missing. Create it in english." #~ msgstr "Page d’aide manquante. Créez la sur english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Page d’aide manquante. Créez la sur english ou French." #~ msgid "Directly load TCX files from JOSM." @@ -23566,9 +24545,12 @@ #~ "inintéressantes des traces." +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Haut Palatinat Geofabrik.de" + +#~ msgid "Start routing" +#~ msgstr "Commencer la navigation" + #~ msgid "Remove route nodes" #~ msgstr "Supprimer les nœuds du chemin" - -#~ msgid "Start routing" -#~ msgstr "Commencer la navigation" #~ msgid "Error processing changeset upload response" @@ -23591,28 +24573,27 @@ #~ "Ne pas envoyer de données après ce message." +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "L'envoi de données a échoué pour une raison inconnue" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Impossible de lire une valeur numérique dans la réponse" -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "L'envoi de données a échoué pour une raison inconnue" +#~ msgid "linked" +#~ msgstr "lié" + +#~ msgid "Overlap tiles" +#~ msgstr "Tuiles se chevauchant" + +#~ msgid "% of lat:" +#~ msgstr "% de lat. :" + +#~ msgid "% of lon:" +#~ msgstr "% de lon. :" #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible." -#~ msgid "Overlap tiles" -#~ msgstr "Tuiles se chevauchant" - -#~ msgid "% of lat:" -#~ msgstr "% de lat. :" - -#~ msgid "% of lon:" -#~ msgstr "% de lon. :" - #~ msgid "Resolve conflicts in member list of of relation {0}" #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}" - -#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " -#~ msgstr "" -#~ "ATTENTION : valeur inattendue du paramètre conflict.resolution, reçu " #~ msgid "" @@ -23623,21 +24604,22 @@ #~ "éléments lorsque les choix de fusion seront appliqués." +#~ msgid "WARNING: unexpected value for preference conflict.resolution, got " +#~ msgstr "" +#~ "ATTENTION : valeur inattendue du paramètre conflict.resolution, reçu " + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Vérification si le nœud {0} est supprimé..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Restauration de la relation..." + #~ msgid "Undeleting Way..." #~ msgstr "Restauration du chemin..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Vérification si le nœud {0} est supprimé..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Restauration de la relation..." +#~ msgid "Keep mine" +#~ msgstr "Conserver ma version" #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Vérification si la primitive {0} est supprimée..." - -#~ msgid "Keep mine" -#~ msgstr "Conserver ma version" - -#~ msgid "Delete mine" -#~ msgstr "Supprimer ma version" #~ msgid "" @@ -23656,4 +24638,7 @@ #~ "{3} pour annuler.
" +#~ msgid "Delete mine" +#~ msgstr "Supprimer ma version" + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -23668,10 +24653,17 @@ #~ msgstr "La sélection est trop large" +#~ msgid "Error when communicating with server." +#~ msgstr "Erreur de communication avec le serveur" + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Page d’aide manquante. Créez la sur english ou French." + #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données" -#~ msgid "Error when communicating with server." -#~ msgstr "Erreur de communication avec le serveur" - #~ msgid "image loading..." #~ msgstr "chargement de l’image..." Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 16826) +++ /applications/editors/josm/i18n/po/gl.po (revision 16827) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" "PO-Revision-Date: 2009-06-27 15:34+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Creando Interface (GUI) principal" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Cambios non gardados" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Hai cambios sen gardar. Descartar os cambios e continuar?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Gardar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Descartar e Sair" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Cancelar" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "DESCOÑECIDO" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Acerca de" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Amosar a pantalla de \"Acerca de\"." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versión {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Último cambio en {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Versión Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Páxina de incio" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Informes de Erro" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Información" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Leeme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisión" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Colaboración" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Engadidos" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Acerca de JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "O ficheiro non puido ser atopado" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Por favor seleccione a fila a borrar." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Seleccionar ou ben:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Acoplar Nodos" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Engadir Nodo..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "Editar: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Introducir as coordenadas para o novo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Usar grados decimais." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos indican que é o hemisferio Oeste/Sur." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitude" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Lonxitude" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Alinear os nodos en círculo" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Mover os nodos seleccionados a un círculo." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +489,58 @@ msgstr "Ferramenta: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Por favor, selecciona polo menos catro nodos." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Alinear os nodos en fila" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Mover os nodos seleccionados a unha liña." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Por favor, selecciona polo menos tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -349,18 +549,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +568,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selección" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "descargar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Facer zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Facer zoom na vista a {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +617,30 @@ msgstr "Vista: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Non se seleccionou nada sobre o que facer zoom." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -456,13 +648,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../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:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Cambiar direccións?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -472,10 +664,10 @@ "invertir algunhas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Invertir e Combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -483,20 +675,20 @@ msgstr "Introducir valores para todos os conflitos." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Resolver Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Todas as vías están vacías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -515,23 +707,24 @@ msgstr "Copiar os obxectos seleccionados ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Por favor, selecciona algo para copiar" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Crear Círculo" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Crear un círculo a partir de tres nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Eses nodos non estan en un círculo" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -539,88 +732,123 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Borrar" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Borrar obxectos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Sobrescribir" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribuir Nodos" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Descargar datos do mapa do servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Ficheiro: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Descargar" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Por favor, selecciona polo menos unha tarefa para descargar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Erros durante a descarga" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar selección copiando e pegando inmediatamente." @@ -640,5 +868,5 @@ msgstr "Sair da aplicación," -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -648,58 +876,73 @@ "GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportar a GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportar os datos a un ficheiro GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nada que exportar. Adquire antes algún dato." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "descripción de trazado gps" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Engadir información do autor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nome real" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefinido" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Ano do Copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Palabras clave" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opcións de exportacińo" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportar e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -710,25 +953,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Erro" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Escoller unha licencia predefinida" @@ -738,46 +961,49 @@ msgstr "Axuda en liña de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Abrir nun navegador" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Edición" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Recargar" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Erro durante a carga da páxina {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Páxina de axuda perdida. Créea en inglés." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -815,30 +1041,40 @@ msgstr "Unir un nodo ós segmentos de vía máis próximos" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Unir Nodo e Liña" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Sen Atallo" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Acoplar de todas formas" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." + +#: ../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:73 +#: ../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:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -846,9 +1082,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Acoplar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -856,60 +1092,71 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Acoplar {0} nodos" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selección" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Reflexar" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Reflexar os nodos e vías seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Por favor, seleccione como mínimo un nodo ou vía." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "arriba" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Mover obxectos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "abaixo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "esquerda" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "dereita" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Mover {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Move Obxectos {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Non se poden mover objectos fora do mundo." @@ -917,5 +1164,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nova" @@ -925,26 +1172,17 @@ msgstr "Crear un novo mapa." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "sen nome" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Abrir..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Abrir un ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Non se puido ler \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -973,35 +1211,36 @@ msgstr "Descargar URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Ortogonalizar Forma" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "So se permiten dous nodos" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "A selección debe estar formada só por vías." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Por favor, selecciona vías con ángulos case rectos para ortogonalizar." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Estas a usar a proxección EPSG:4326 que pode conducir
a resultados " @@ -1009,9 +1248,9 @@ "desfacerte desta advertencia.
Queres continuar?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Só hai un nodo seleccionado" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Ortogonalizar" @@ -1027,11 +1266,11 @@ msgstr "Pegar contidos ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Pegar Etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1061,16 +1300,21 @@ msgstr "Refacer a última acción desfeita." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Renomear capa" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Renomear tamén o ficheiro" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Non se puido renomear o ficheiro \"{0}\"" @@ -1084,9 +1328,9 @@ msgstr "Invertir a dirección de todas as vías seleccionadas." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Por favor, selecciona polo menos unha vía." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Invertir vías" @@ -1094,17 +1338,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Gardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Gardar os datos actuais." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "O arquivo {0} existe. Sobreescribir?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1114,25 +1360,25 @@ "favor, informa disto como un erro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Non hai documentos abertos, polo que non hai nada que gardar." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Documento valeiro" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "O documento non contén datos." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Gardar de todas formas" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1142,55 +1388,77 @@ "como se os rexeitases todos. Continuar?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Rexeitar Conflitos e Gardar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Gardar ficheiro OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Gardar ficheiro GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Gardar Capa" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Non se puido facer copia de seguridade do ficheiro." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Extensión de ficheiro descoñecida: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Ocurriu un erro mentres se gardaba." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" +"Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Extensión de ficheiro descoñecida." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Ocurriu un erro mentres se gardaba." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "" "Produciuse un erro mentras se restauraba o ficheiro de copia de seguridade." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Gardar como..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Gardar os datos actuais nun novo ficheiro." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Seleccionar Todo" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1225,16 +1493,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Pechar" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Separar Vía" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Separar unha vía no nodo seleccionado." @@ -1244,5 +1512,5 @@ msgstr "A selección actual non pode ser usada para a separación." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1250,5 +1518,5 @@ msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1264,9 +1532,9 @@ "selecciona tamén a vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Os nodos seleccionados non comparten a mesma vía." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1274,10 +1542,10 @@ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Debes seleccionar dous ou máis nodos para separar unha vía circular." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1287,17 +1555,17 @@ "nodos no medio da vía.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1318,47 +1586,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Seleccionar ou ben:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Un nodo etiquetado, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo que está sendo usado por máis dunha vía, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1367,5 +1635,5 @@ "vía, ou" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1374,5 +1642,5 @@ "vía." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1385,9 +1653,9 @@ "obterán as súas propias copias e todos os nodos serán seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Despegar Nodo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1395,5 +1663,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1409,142 +1677,91 @@ msgstr "Desfacer a última acción." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Deseleccionar Todo" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Deseleccionar todos os obxectos." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Deseleccionar Todo (Enfocar)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Deseleccionar Todo (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Actualizar Datos" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Non se atoparon datos para actualizar. Abriches ou descargaches xa unha capa " -"de datos?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Fallou ao actualizar as primitivas seleccionadas." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Actualización fallida" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Non se puido atopar a primitiva coa id {0} no paquete de datos actual" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Primitiva desaparecida" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Actualizar Selección" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Non hai primitivas seleccionadas para actualizar." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selección valeira" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "SIbir todos os cambios ó servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Obxectos para engadir:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Obxectos para modificar:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Obxectos para borrar:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Subir estes cambios?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Subir Cambios" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Non hai cambios que subir." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Actualizando" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Actualizando primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizar só {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1566,17 +1783,17 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Detectado un conflito" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "valor retornado non esperado. Obtívose {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1592,5 +1809,5 @@ "editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1599,57 +1816,60 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Actualizando primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "SIbir todos os cambios ó servidor OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"A subida ao servidor fallou porque o teu
paquete " -"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Violación de condición previa" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"A subida fallou porque a primitiva que intentou " -"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "A primitiva xa foi borrada" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, 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 "" -"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." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Obxectos para engadir:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Obxectos para modificar:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1737,42 +1957,54 @@ msgstr "Avance máis lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Datos GPX Descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Datos GPS en bruto" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Descargando datos" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Non se importaron datos." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Datos OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Descarga {0} de {1} ({2} restantes)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Subindo datos" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Ocurriron os seguintes erros durante a descarga masiva:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Erros durante a descarga" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1784,21 +2016,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Primitivas borradas ou movidas" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Borrar Modo" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Borrar nodos ou vías." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1806,5 +2038,5 @@ msgstr "Modo: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1814,769 +2046,23 @@ "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Debuxar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Debuxar nodos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Foco do Debuxo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "seleccionado" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Engadir nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Engadir nodo na vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Conectar via existente a nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Engadir nodo a vía e conectar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Crear novo nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Seleccionar nodo baixo o cursor." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Insertar novo nodo na vía." -msgstr[1] "Insertar novo nodo en {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Continuar vía a partir do último nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Rematar debuxo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Extrudir" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Crear áreas" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Extrudir Vía" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Soltar o botón do rato para deter a rotación." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Arrastrar un segmento de vía para crear un rectángulo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o " -"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Seleccionar" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Seleccionar, mover e rotar obxectos" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Engadir e mover un novo nodo virtual a unha vía." -msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis " -"próximo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para " -"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Facer zoom e mover mapa" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl" -"+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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Buscar..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Buscar obxectos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Non se cargaron datos." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Por favor, introduce unha cadea de busca." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "reemplazar selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "engadir á selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "eliminar da selección" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "sensible a maiúsculas" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "expresión regular" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "Baker Street - 'Baker' e 'Street' en calquer clave ou nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' en calquera clave ou nome." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - a clave 'type' con calquer valor. Proba tamén *=value, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Obxectivos especiais:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - todos os obxectos cambiados polo usuario" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - obxecto coa ID indicada" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - todos os obxectos cambiados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - todos os obxectos seleccionados" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - todos os obxectos incompletos" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - todos os obxectos sen etiquetar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"child expresión - todos os fillos de obxectos que coincidan " -"coa expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"parent expr - todos os pais de obxectos que coincidan coa " -"expresión" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -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:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Usar ( e ) para agrupar expresións" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Buscar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Comezar Busca" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Non se atoparon coincidencias para \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Atopadas {0} coincidencias" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro " -"completo:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou " -"relación" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Faltan argumentos para OR." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Faltan argumentos para NOT." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Esperabase parentese de peche." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Número de parámetros incorrecto para o operador nodes." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número " -"de nodos ou un rango, por exemplo nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Valor incorrecto do operador id: {0}. Espérase un número." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Contacto {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Descargando..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Non se puido ler dende a URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Erro de análise na URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Erro durante a comunicación co servidor." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Eliminar \"{0}\" para {1} \"{2}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Establecer {0}={1} para {2} \"{3}\"" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "obxecto" -msgstr[1] "obxectos" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Eliminar \"{0}\" para {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Establecer {0}={1} para {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Resolver conflitos en coordenadas en {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Borrar {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Borrar {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relación contradictoria" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Borrar da relación" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Separar segmento de vía" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Estás a punto de borrar nodos que se atopan fora da área que descargaches." -"
Isto pode causar problemas porque outros obxectos (que non ves) poden " -"estar usandoos.
Queres borralos realmente?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Resolver conflitos en estado borrado en {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Mover" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nodo" -msgstr[1] "nodos" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Purgando 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de " -"2. Os actuais son {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Resolver conflitos na lista de membros da relación {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Secuencia" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Resolver conflitos de versión para {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Resolver conflitos na lista de nodos da vía {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Aplicar?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos " -"seus nodos son suxeridos para manter a consistencia dos datos." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relación" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Papel antigo" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Novo papel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Clave antiga" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Valor antigo" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nova clave" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Novo valor" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Aplicar os cambios seleccionados" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Non aplicar cambios" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Propiedades de " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Papeis nas relacións que fan referencia a" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Corrección" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"O ficheiro de preferencias contiña erros. Creando copia de seguridade do " -"antigo a {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Preferencias almacenadas en {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Non se puideron cargar as preferencias dende o servidor." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2588,8 +2074,807 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "o parámetro \"{0}\" debe non ser nulo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Debuxar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Debuxar nodos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "seleccionado" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Engadir nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Engadir nodo na vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Conectar via existente a nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Engadir nodo a vía e conectar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Crear novo nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Seleccionar nodo baixo o cursor." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Insertar novo nodo na vía." +msgstr[1] "Insertar novo nodo en {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Continuar vía a partir do último nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Rematar debuxo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Extrudir" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Crear áreas" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Extrudir Vía" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Soltar o botón do rato para deter a rotación." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Arrastrar un segmento de vía para crear un rectángulo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o " +"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Seleccionar" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Seleccionar, mover e rotar obxectos" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Engadir e mover un novo nodo virtual a unha vía." +msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis " +"próximo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para " +"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Facer zoom e mover mapa" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl" +"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Buscar..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Buscar obxectos." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Por favor, introduce unha cadea de busca." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "reemplazar selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "engadir á selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "eliminar da selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "sensible a maiúsculas" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "expresión regular" + +#: ../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' e 'Street' en calquer clave ou nome." + +#: ../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' en calquera clave ou nome." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - a clave 'type' con calquer valor. Proba tamén *=value, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Obxectivos especiais:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +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 +msgid "user:... - all objects changed by user" +msgstr "user:... - todos os obxectos cambiados polo usuario" + +#: ../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 +msgid "modified - all changed objects" +msgstr "modified - todos os obxectos cambiados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - todos os obxectos seleccionados" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - todos os obxectos incompletos" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - todos os obxectos sen etiquetar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"child expresión - todos os fillos de obxectos que coincidan " +"coa expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"parent expr - todos os pais de obxectos que coincidan coa " +"expresión" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +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 +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 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Buscar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Comezar Busca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Atopadas {0} coincidencias" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro " +"completo:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou " +"relación" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Faltan argumentos para OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Faltan argumentos para NOT." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Esperabase parentese de peche." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Número de parámetros incorrecto para o operador nodes." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número " +"de nodos ou un rango, por exemplo nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valor incorrecto do operador id: {0}. Espérase un número." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Cargar Selección" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Contacto {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Descargando..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, 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 +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}''" +msgstr "Eliminar \"{0}\" para {1} \"{2}\"" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "obxecto" +msgstr[1] "obxectos" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Eliminar \"{0}\" para {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Establecer {0}={1} para {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Solucionar Conflito" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Non se atoparon coincidencias para \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Resolver conflitos en coordenadas en {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"A selección \"{0}\" é usada pola relación \"{1}\".\n" +"Borrar da relación?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Separar segmento de vía" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Estás a punto de borrar nodos que se atopan fora da área que descargaches." +"
Isto pode causar problemas porque outros obxectos (que non ves) poden " +"estar usandoos.
Queres borralos realmente?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Borrar da relación" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Resolver conflitos en estado borrado en {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Mover" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nodo" +msgstr[1] "nodos" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Purgando 1 primitiva" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de " +"2. Os actuais son {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Secuencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Resolver {0} conflitos de etiquetas en {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Resolver conflitos de versión para {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Resolver conflitos na lista de nodos da vía {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Aplicar?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos " +"seus nodos son suxeridos para manter a consistencia dos datos." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relación" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Papel antigo" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Novo papel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Clave antiga" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Valor antigo" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nova clave" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Novo valor" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Aplicar os cambios seleccionados" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Non aplicar cambios" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Propiedades de " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Papeis nas relacións que fan referencia a" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Corrección" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Preferencias almacenadas en {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +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 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2617,5 +2902,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2624,27 +2909,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "nodos" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2652,13 +2937,13 @@ msgstr[1] "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "vías" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2666,22 +2951,22 @@ msgstr[1] "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relacións" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2695,23 +2980,23 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "Carretera" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "Vía férrea" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "Vía acuática" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2769,5 +3054,5 @@ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "A vía de estilo de área non está pechada." @@ -2905,9 +3190,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2924,5 +3204,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "fondo" @@ -2933,8 +3213,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2945,5 +3225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Zona Lambert (Franza)" @@ -2966,22 +3246,138 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Non se puideron ler os marcadores." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Non se puido escribir o marcador." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Non amosar de novo" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"A subida ao servidor fallou porque o teu
paquete " +"de datos actual viola a condición previa.
A mensaxe de erro é:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Violación de condición previa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "descoñecido" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Excepción Inesperada" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Non se puido conectar co servidor osm. Por favor revisa a túa conexión a " +"internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +msgid "Unknown host" +msgstr "Maquina descoñecida" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"A subida fallou porque a primitiva que intentou " +"borrar
no servidor xa está borrada.

A mensaxe de erro é:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Mensaxe do día non dispoñible" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Descargando \"Mensaxe do día\"" @@ -3062,63 +3458,57 @@ msgstr "Contrasinal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Non se puido atopar traducción para a localización {0}. Volvendo a {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opcións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Amosar esta axuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Argumento de xeometría unix estandar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Descargar a caixa de límites" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Descargar a caixa de límites como datos gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Seleccionar coa busca indicada" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Restablecer as preferencias ós valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Establecer o idioma." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3128,51 +3518,51 @@ "que cargas algo de información antes de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "En lugar de --download= debes especificar osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Activando extensións actualizadas" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Cargando extensións anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Establecendo valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3180,21 +3570,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Vista de malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Cambiar Vista de Malla" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Cambiar a vista de pantalla completa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3238,53 +3628,68 @@ msgstr "escalar" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "A lonxitude xeográfica na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "O nome do obxecto na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "A latitude xeográfica na posición do punteiro do rato." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "O ángulo entre o segmento previo e o actual da vía." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "A dirección (da brúxula) do segmento de liña que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "A lonxitude do novo segmento de vía que se está a debuxar." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(sen obxecto)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "a capa non está na lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contactando co servidor OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Erro durante a análise" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3309,4 +3714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inicializando" @@ -3338,20 +3744,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3359,47 +3765,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3407,25 +3813,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3462,5 +3868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3471,5 +3877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3483,5 +3889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3556,7 +3962,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3630,14 +4035,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3666,10 +4071,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3678,19 +4083,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Si, desfacer o borrado de eles tamén" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Non, cancelar a operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3701,9 +4106,9 @@ "servidor.

Quere desfacer o borrado de eses nodos tamén?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Desfacer o borrado de nodos adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3713,13 +4118,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Desfacer o borrado de primitivas dependentes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3727,90 +4132,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3820,5 +4225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3843,12 +4248,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3893,10 +4297,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3905,10 +4309,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3917,5 +4321,5 @@ msgstr "Valor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3975,9 +4379,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3985,5 +4389,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4015,42 +4419,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Gardar de todas formas" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Resolver conflitos de versión para {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4068,23 +4489,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "" @@ -4092,73 +4513,106 @@ #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Capas" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Borrar a capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Existen cambios sen gardar. Borrar a capa igualmente?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Borrar Capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Desexas realmente borrar a capa completa?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Información" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Borrar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Borrar {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Amosar/Ocultar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Cambiar o estado visible da capa seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Amosar/Ocultar Texto/Iconas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Cambiar o estado visible do texto e iconas da marca." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Capas" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "Inactivo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Borrar a capa seleccionada." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Mover a capa seleccionada unha fila cara abaixo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Capas: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Máis información acerca desta característica" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4167,22 +4621,28 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Un valor vacío borra a clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4191,85 +4651,90 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Por favor selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Propiedades dos obxectos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Borrar realmente a selección da relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Engadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Editar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Borrar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "" @@ -4278,63 +4743,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Abrir unha lista con todas as relacións." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relacións: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Crear unha nova relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relacións: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Borrar a relación seleccionada" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Selección Actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Abrir unha ventá de lista de selección." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Actualizar a lista de seleccion." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Facer zoom sobre a selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selección" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4343,5 +4810,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4350,5 +4817,5 @@ msgstr[1] "{0} relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4359,5 +4826,10 @@ msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4366,144 +4838,411 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" "Abrir a lista da xente que está a traballar nos obxectos seleccionados." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autores: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Área de Descarga" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Descargar Lugar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relacións" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Descargando datos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relacións" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Refacer a última acción desfeita." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Fallou ao actualizar as primitivas seleccionadas." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Mover os membros actualmente seleccionados cara arriba" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Mover os membros seleccionados actualmente cara abaixo" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Eliminar da relación todos os obxectos seleccionados actualmente" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Borrar a relación seleccionada" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Non, cancelar a operación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Relación contradictoria" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Gardar os datos actuais." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Descargar todas as vías e nodos incompletos na relación" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Descargar Membros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Reducir Zoom" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Mover os membros seleccionados actualmente cara abaixo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Aplicar Cambios" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Básico" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Ocupado por" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Mover cara arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Mover os membros actualmente seleccionados cara arriba" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Engadir Seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Engadir todos os obxectos seleccionados actualmente como membros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Eliminar Seleccionados" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Eliminar da relación todos os obxectos seleccionados actualmente" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Mover cara abaixo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Mover os membros seleccionados actualmente cara abaixo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Eliminar o membro da fila actual desta relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Descargar Membros" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor de Relación: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Cargar Selección" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4513,5 +5252,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4521,25 +5260,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Marcadores" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Por favor, primeiro introduce as coordenadas desexadas." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Por favor, introduce un nome para o lugar." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "engadir á selección" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Selecciona primeiro un marcador." @@ -4574,22 +5310,22 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Fontes de Datos e Tipos" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Descargar como unha nova capa" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Área de Descarga" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" "Área de descarga demasiado grande; probablemente será rexeitada polo servidor" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4598,13 +5334,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Por favor introduce unha cadea de busca" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Non se poden ler resultados de busca de lugar dende o servidor" @@ -4612,5 +5348,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Introduce o nome do lugar a buscar:" @@ -4618,5 +5354,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4624,6 +5360,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nome" @@ -4662,6 +5398,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4684,15 +5420,15 @@ msgstr "tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "cerca" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4701,5 +5437,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4731,5 +5467,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5471,5 +6213,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5636,59 +6378,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Imaxes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Ler GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Non hai hora para o punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Non se atoparon imaxes con marcas de tempo lexibles." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Inicio GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Fin GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "Diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5696,138 +6438,128 @@ msgstr[1] "imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} dentro da traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sincronizar reloxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "imaxes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "A data no ficheiro \"{0}\" non puido ser analizada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Non hai hora EXIF no ficheiro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Imaxe" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria da unidade GPS (differencia coa foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora coa da unidade GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "A hora introducida non puido ser analizada." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punto gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personalizar debuxo de liñas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Usar configuración global." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Debuxar liñas entre puntos para esta capa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Non debuxar liñas entre puntos para esta capa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Seleccionar as opcións de liña do debuxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personalizar Cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Escolle unha cor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importar Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Ficheiros Wave Audio (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Marcas de audio de {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importar imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5836,5 +6568,5 @@ msgstr[1] "{0} trazados, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5843,5 +6575,5 @@ msgstr[1] "{0} rutas, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5850,30 +6582,30 @@ msgstr[1] "{0} puntos de vía" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Descrición: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Rango de tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lonxitude: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Convertir en capa de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5883,43 +6615,43 @@ "perxudicial.
Se desexas subir trazados, mira aqui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Convertido de: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metros" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Área máxima por petición:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km cad." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5930,9 +6662,9 @@ "Desexas
continuar?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5940,5 +6672,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5948,47 +6680,47 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6013,5 +6745,5 @@ msgstr[1] "trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6019,5 +6751,5 @@ msgstr[1] "puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6026,5 +6758,5 @@ msgstr[1] "un trazado con {0} puntos" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6033,5 +6765,5 @@ msgstr[1] "{0} componse de {1} trazados" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6050,5 +6782,5 @@ msgstr[1] "marcas" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6057,9 +6789,9 @@ msgstr[1] "{0} componse de {1} marcas" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sincronizar Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6067,20 +6799,20 @@ "Debes pausar o audio no momento que escoites a túa entrada de sincronización." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Audio sincronizado no punto {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Non se pode sincronizar nunha capa en reproducción." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6088,10 +6820,17 @@ msgstr "Debes ter pausado o audio no punto da pista onde queres a marca." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Amosar/Ocultar Texto/Iconas" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Cambiar o estado visible do texto e iconas da marca." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6099,5 +6838,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6105,29 +6844,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Non se puido crear unha nova marca de audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Houbo un erro tratando de amosar a URL desta marca." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(a URL era: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Erro amosando a URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Preferencias avanzadas" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Establecemento directo de entradas de preferencia. Usar con coidado!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6135,27 +6874,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "O valor actual é o predeterminado." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "O valor predeterminado é \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Por favor selecciona a fila a editar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6163,14 +6902,14 @@ msgstr "Novo valor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Por favor seleccione a fila a borrar." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Introduce un novo par clave/valor." @@ -6311,40 +7050,40 @@ msgstr "Calibración do grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Cor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Estilo de pintura {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Capa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Escoller" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Escolle unha cor para {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Establecer a predeterminado" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Establecer todos ós predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Cores usadas por diferentes obxectos en JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Cores" @@ -6690,46 +7429,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configurar os engadidos dispoñibles." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Descargar lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Actualizar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configurar sitios..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Por favor selecciona unha entrada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Configurar os sitios dos engadidos" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Preferencias de Visualización" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6739,29 +7486,29 @@ "programa." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Preferencias de Conexión" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Preferencias de conexión para o servidor OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Preferencias do Mapa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Parámetros para a proxección do mapa e interpretación de datos." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Preferencias de audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Parámetros para o reproductor de audio e as marcas de audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos." @@ -6864,59 +7611,61 @@ msgstr "Atallo" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Borrar da lista a fonte seleccionada." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7107,33 +7856,33 @@ msgstr "Grupos de modificadores" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Máis información acerca desta característica" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Usar axuste preestablecido \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "vía pechada" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7144,15 +7893,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7162,18 +7911,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -7184,33 +7933,36 @@ msgstr "Grupo de axustes preestablecidos \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Contactando co Servidor OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descargando os puntos {0} a {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Descargando datos de OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Preparando datos..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Non se puido ler \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7218,21 +7970,21 @@ msgstr "Ficheiros GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Marcas de {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7248,10 +8000,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7259,48 +8030,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Ficheiros NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordenadas importadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Sentencias mal formadas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Erros de suma de verificación: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Sentencias descoñecidas: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Coordenada cero: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Importación NMEA satisfactoria" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Fallo de importación NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7311,15 +8081,15 @@ "acepta {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7327,23 +8097,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Subindo..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Estilo de pintura {0}: {1}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7386,9 +8169,4 @@ msgid "Login" msgstr "Inicio de sesión" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Abortando..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7439,66 +8217,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Erro durante a análise." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Ficheiros de Servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Versión descoñecida" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Falta o número de versión dos datos do OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Versión descoñecida: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Atopouse un elemento no que non é unha vía." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " ten referencia cero" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Atopouse un elemento no que non é unha relación." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Especificación incompleta de elemento con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Obxecto ilegal con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7506,46 +8288,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Falta o atributo obrigatorio \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Preparar os datos de OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "ID de nodo mal formada" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Contactando co Servidor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7554,5 +8356,18 @@ "internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7561,16 +8376,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} restantes. Subindo {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Actualizar Engadidos" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Descargar Engadidos" @@ -7587,5 +8397,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7594,23 +8404,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7621,34 +8431,32 @@ msgstr "Ocurriu un erro no engadido {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Advertencia - foi solicitada a descarga do engadido {0}. Este engadido xa " "non é necesario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "O engadido {0} foi requerida polo engadido {1} pero non se atopou." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Engadido non atopado: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "A última actualización de engadidos foi fai máis de {0} días." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7659,21 +8467,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Desactivar engadido" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7683,5 +8491,5 @@ "permisos para sobrescribir os existentes." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7690,10 +8498,10 @@ "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Dacordo coa información contida no engadido, o autor é {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7702,9 +8510,9 @@ "dun fallo." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Debería ser desactivado o engadido?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7712,27 +8520,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"O engadido non puido ser eliminado. Por favor, comentalle o problema á xente " -"que che propocionou JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Información" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Non se atopou información de engadidos." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "sen descripción dispoñible" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7741,13 +8545,18 @@ msgstr[1] "Descargada información de engadidos de {0} sitios" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Non se atopou información de engadidos." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Todos os engadidos instalados estan actualizados." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7760,9 +8569,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Descargar engadidos perdidos" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7775,57 +8584,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "descoñecido" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versión {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Engadido empaquetado con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Erro lendo o ficheiro de informaclión de engadido: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Isto está despois do fin da grabación" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Erro reproducindo son" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Non facer nada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Informar de Fallo" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7840,18 +8627,18 @@ "erro." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Excepción Inesperada" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7859,17 +8646,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Asegúrate de incluir a seguinte información:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(O texto xa foi copiado ao teu portapapeis.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Non amosar de novo" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7879,5 +8683,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7885,5 +8689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7892,13 +8696,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Consello: Pode editar os atallos nas preferencias.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7906,21 +8725,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Seleccionar dúas vías cun nodo en común" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7928,74 +8747,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Público" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Conectando..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Subida de datos cancelada" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Error durante a subida de datos" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "A subida do GPX tivo éxito" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Subindo trazado GPX: {0}% ({1} de {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -8065,33 +8885,34 @@ msgstr "Un dos ficheiros seleccionados era nulo !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Ler fotos..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Atopouse un ficheiro nulo no directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Erro obtendo ficheiros do directorio {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8111,15 +8932,15 @@ msgstr "Ficheiros GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Erro durante a análise {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8128,34 +8949,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8163,69 +8984,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8234,9 +9055,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8245,65 +9066,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8311,13 +9132,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valores Predeterminados" @@ -8339,5 +9160,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Erro cargando ficheiro" @@ -8360,6 +9181,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8525,22 +9346,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8548,18 +9369,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8672,6 +9493,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "" @@ -8700,5 +9521,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8709,14 +9530,14 @@ "Crear unha nova." +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8804,4 +9625,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Non se cargaron datos." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8812,9 +9638,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8935,30 +9761,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8967,14 +9793,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -9065,40 +9891,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -9107,26 +9933,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9211,7 +10029,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "" @@ -9356,9 +10174,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9598,18 +10416,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "Abrir só ficheiros que sexan visibles na vista actual." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9634,33 +10452,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9669,28 +10487,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9954,4 +10772,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10198,33 +11037,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10256,6 +11095,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10265,10 +11104,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10355,22 +11194,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." msgstr "" @@ -10442,22 +11273,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10530,23 +11361,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10557,7 +11388,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10565,78 +11396,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10644,83 +11477,83 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Usar ficheiro de datos por defecto." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Usar o ficheiro de datos por defecto (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Usar ficheiro de comprobación ortográfica predeterminado." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10865,7 +11698,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "" @@ -10879,5 +11712,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10911,10 +11744,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10968,7 +11801,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10980,10 +11837,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11032,14 +11889,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11050,26 +11907,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11077,5 +11934,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11085,5 +11942,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11092,107 +11949,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" 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:337 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Nome de Menú (Predeterminado)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "URL WMS (Predeterminada)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copiar Predeterminado" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11297,11 +12154,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11311,10 +12173,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11322,5 +12184,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11330,5 +12192,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11338,15 +12200,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11354,5 +12216,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11360,5 +12222,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11367,15 +12229,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11384,10 +12246,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11396,15 +12258,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11414,10 +12276,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11426,5 +12288,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11433,5 +12295,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11439,11 +12301,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12598,58 +13467,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12663,6 +13480,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12688,6 +13505,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12713,6 +13530,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12738,6 +13555,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12751,5 +13568,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12767,5 +13584,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12799,6 +13616,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12825,6 +13642,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12874,5 +13691,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "" @@ -13851,5 +14668,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15580,27 +16397,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "" @@ -18439,7 +19256,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18509,7 +19326,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18535,5 +19352,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -19024,13 +19841,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -19072,5 +19889,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19290,4 +20107,65 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +msgid "motorroad" +msgstr "" + #. color tertiary #. @@ -19322,6 +20200,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19377,7 +20255,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19433,8 +20311,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19455,5 +20333,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19467,5 +20345,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19486,5 +20364,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19499,5 +20377,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19512,5 +20390,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19524,5 +20402,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19536,5 +20414,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19562,5 +20440,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19728,13 +20606,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19796,7 +20674,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19819,10 +20697,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19858,7 +20736,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19903,6 +20781,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19916,5 +20794,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19936,5 +20814,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19948,5 +20826,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19994,7 +20872,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -20011,5 +20889,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -20024,5 +20902,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -20037,5 +20915,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -20050,5 +20928,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20063,5 +20941,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20076,5 +20954,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20179,10 +21057,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20196,5 +21074,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -20208,5 +21086,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20334,12 +21212,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20353,5 +21231,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20423,8 +21301,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20526,10 +21404,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20915,22 +21793,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20962,6 +21840,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -21022,8 +21900,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21376,26 +22254,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21467,8 +22345,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "" @@ -21618,9 +22496,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "" @@ -21692,8 +22570,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21764,8 +22642,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21779,5 +22657,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21791,5 +22669,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21811,5 +22689,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21823,5 +22701,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "" @@ -21835,5 +22713,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21856,5 +22734,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21868,5 +22746,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21880,5 +22758,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21892,5 +22770,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21904,5 +22782,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21959,7 +22837,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21973,5 +22851,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21984,5 +22862,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21997,5 +22875,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "" @@ -22009,5 +22887,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "" @@ -22062,8 +22940,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -22077,5 +22955,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -22089,5 +22967,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -22101,5 +22979,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -22113,5 +22991,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -22125,5 +23003,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "" @@ -22201,8 +23079,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22250,7 +23128,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22392,10 +23270,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22443,6 +23321,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22739,74 +23617,98 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Capa de datos" - -#~ msgid "Uploading data" -#~ msgstr "Subindo datos" - -#~ msgid "Not implemented yet." -#~ msgstr "Ainda sen implementar." - -#~ msgid "Email" -#~ msgstr "Correo Electrónico" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolver Conflitos" - -#~ msgid "There were conflicts during import." -#~ msgstr "Houbo conflitos durante a importación." +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha " +#~ "capa de datos?" + +#~ msgid "Update failed" +#~ msgstr "Actualización fallida" + +#~ msgid "Missing primitive" +#~ msgstr "Primitiva desaparecida" + +#~ msgid "Layers: {0}" +#~ msgstr "Capas: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Eliminar o membro da fila actual desta relación" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á " +#~ "xente que che propocionou JOSM." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou " +#~ "logo de esperar un tempo." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n" + +#~ msgid "Aborting..." +#~ msgstr "Abortando..." + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " +#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactando co servidor OSM..." + +#~ msgid "Basic" +#~ msgstr "Básico" + +#~ msgid "Occupied By" +#~ msgstr "Ocupado por" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)" + +#~ msgid "Move Up" +#~ msgstr "Mover cara arriba" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Engadir todos os obxectos seleccionados actualmente como membros" + +#~ msgid "Remove Selected" +#~ msgstr "Eliminar Seleccionados" + +#~ msgid "Move Down" +#~ msgstr "Mover cara abaixo" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor de Relación: {0}" + +#~ msgid "Error parsing server response." +#~ msgstr "Erro analizando a resposta do servidor." + +#~ msgid "Cannot connect to server." +#~ msgstr "Non se pode conectar co servidor." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Fai click en Recargar para actualizar a lista" #~ msgid "Object" #~ msgstr "Obxecto" -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} obxecto ten conflitos:" -#~ msgstr[1] "{0} obxectos teñen conflitos:" - -#~ msgid "my version:" -#~ msgstr "a miña versión:" - -#~ msgid "their version:" -#~ msgstr "a súa version:" - -#~ msgid "resolved version:" -#~ msgstr "versión final:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Nome de usuario OSM (correo-e)" - -#~ msgid "Unknown host" -#~ msgstr "Maquina descoñecida" - -#~ msgid "position" -#~ msgstr "posición" - -#~ msgid "different" -#~ msgstr "diferente" - -#~ msgid "true" -#~ msgstr "verdadeiro" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Solucionar {0} conflitos en {1} obxectos" - -#~ msgid "Change" -#~ msgstr "Cambiar" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Fai click en Recargar para actualizar a lista" +#~ msgid "Date" +#~ msgstr "Data" #~ msgid "Revert" #~ msgstr "Revertir" - -#~ msgid "Date" -#~ msgstr "Data" #~ msgid "" @@ -22817,35 +23719,33 @@ #~ "versión seleccionada na lista do historial." -#~ msgid "Rotate" -#~ msgstr "Xirar" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)" - -#~ msgid "Error parsing server response." -#~ msgstr "Erro analizando a resposta do servidor." - -#~ msgid "Cannot connect to server." -#~ msgstr "Non se pode conectar co servidor." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar" +#~ msgid "Not implemented yet." +#~ msgstr "Ainda sen implementar." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Nome de usuario OSM (correo-e)" + +#~ msgid "Tagging preset source" +#~ msgstr "Fonte de etiquetado preestablecido" + +#~ msgid "Tagging preset sources" +#~ msgstr "Fontes de etiquetado preestablecido." #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki." -#~ msgid "Tagging preset source" -#~ msgstr "Fonte de etiquetado preestablecido" - -#~ msgid "Tagging preset sources" -#~ msgstr "Fontes de etiquetado preestablecido." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou " -#~ "logo de esperar un tempo." +#~ msgid "their version:" +#~ msgstr "a súa version:" + +#~ msgid "my version:" +#~ msgstr "a miña versión:" + +#~ msgid "resolved version:" +#~ msgstr "versión final:" + +#~ msgid "Add Selected" +#~ msgstr "Engadir Seleccionados" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22853,53 +23753,4 @@ #~ msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM." #~ msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Non se puido descargar o engadido: {0} de {1}" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato " -#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click." - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "O engadido require a actualización de JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "O engadido xa existe" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Erro borrando ficheiro de engadido: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Algúns dos nodos están (case) na liña" - -#~ msgid "Import TCX File..." -#~ msgstr "Importar Ficheiro TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importar ficheiro TCX como trazado GPS" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo " -#~ "de preferencias.
O contrasinal é transferido ó servidor en texto " -#~ "plano, codificado na URL.
Non uses un contrasinal valioso." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de " -#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/" -#~ "TaggingPresets para obter axuda." #~ msgid "" @@ -22909,4 +23760,19 @@ #~ "O engadido {0} semella estar estropeado ou non puido ser descargado " #~ "automáticamente." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "O engadido require a actualización de JOSM: {0}." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Non se puido descargar o engadido: {0} de {1}" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Erro borrando ficheiro de engadido: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "O engadido xa existe" + +#~ msgid "Delete and Download" +#~ msgstr "Borrar e Descargar" #~ msgid "" @@ -22921,12 +23787,33 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflitos: {0}" - -#~ msgid "Delete and Download" -#~ msgstr "Borrar e Descargar" - -#~ msgid "Solve Conflict" -#~ msgstr "Solucionar Conflito" +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de " +#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets para obter axuda." + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo " +#~ "de preferencias.
O contrasinal é transferido ó servidor en texto " +#~ "plano, codificado na URL.
Non uses un contrasinal valioso." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importar ficheiro TCX como trazado GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Importar Ficheiro TCX..." + +#~ 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 "" @@ -22937,4 +23824,7 @@ #~ "elementos xa subidos teñen historial." +#~ msgid "unnamed" +#~ msgstr "sen nome" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " @@ -22947,4 +23837,28 @@ #~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:" +#~ msgid "Data Layer" +#~ msgstr "Capa de datos" + +#~ msgid "Change" +#~ msgstr "Cambiar" + +#~ msgid "Rotate" +#~ msgstr "Xirar" + +#~ msgid "position" +#~ msgstr "posición" + +#~ msgid "different" +#~ msgstr "diferente" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "true" +#~ msgstr "verdadeiro" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Non se pode ler valor numérico da resposta" @@ -22953,21 +23867,18 @@ #~ msgstr "A subida de datos fallou por causa descoñecida" +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Comprobando se o nodo {0} falta ..." + #~ msgid "Undeleting Way..." #~ msgstr "Desfacendo borrado de vía..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Comprobando se o nodo {0} falta ..." - #~ msgid "Undeleting relation..." #~ msgstr "Desfacendo o borrado da relación.." +#~ msgid "Keep mine" +#~ msgstr "Conservar a miña" + #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Comprobando se a primitiva {0} falta ..." - -#~ msgid "Keep mine" -#~ msgstr "Conservar a miña" - -#~ msgid "Delete mine" -#~ msgstr "Borrar a miña" #~ msgid "" @@ -22986,4 +23897,7 @@ #~ "
Fai click en {3} para cancelar.
" +#~ msgid "Delete mine" +#~ msgstr "Borrar a miña" + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -22998,4 +23912,21 @@ #~ msgstr "Selección demasiado grande" +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Solucionar {0} conflitos en {1} obxectos" + +#~ msgid "There were conflicts during import." +#~ msgstr "Houbo conflitos durante a importación." + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} obxecto ten conflitos:" +#~ msgstr[1] "{0} obxectos teñen conflitos:" + +#~ msgid "Conflicts: {0}" +#~ 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 16826) +++ /applications/editors/josm/i18n/po/he.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-06-27 16:03+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-08-02 16:36+0000\n" +"Last-Translator: mrli \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" -msgstr "" +msgstr "יוצר ממשקי גרפי ראשי" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור" + +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "שגיאה" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." -msgstr "רמז: כמה מהשינויים הגיעו מהעלאת נתונים חדשים לשרת." - -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת." + +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "שינויים לא שמורים" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "שמור וצא" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "התעלם משינויים וצא" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "ביטול" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "אזהרה" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "לא ידוע" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "אודות" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "הצג את מסך האודות." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "גירסא {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "שינוי אחרון ב {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "גירסת Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "דף הבית" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "דיווחי תקלות" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "מידע" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "קרא אותי" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "מהדורה" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "תרומה" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "רישיון" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "תוספים" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "אודות JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "לא ניתן למצוא את הקובץ." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "אזהרה" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "נא בחר את השורה למחיקה." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "בחר:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "מיזוג צמתים" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "הוסף נקודה..." @@ -241,14 +406,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -256,57 +423,57 @@ msgstr "ערוך: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "הכנס את הקורדינטות של הנקודה החדשה." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "השתמש במעלות עשרוניות." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "קו רוחב" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "קו אורך" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "סדר את הצמתים בעיגול" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "העבר את הצמתים הנבחרים לעיגול." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -322,25 +489,58 @@ msgstr "כלי: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "נא בחר לפחות ארבעה צמתים." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "מידע" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "ישר את הצמתים בשורה" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "הזז את הנקודות הנבחרות לתוך קו" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "נא בחר לפחות שלושה צמתים." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -349,25 +549,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" "Warning: automatically truncating value of tag ''{0}'' on deleted primitive " "{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -375,47 +567,49 @@ "length {2}. Values length is {3}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +"אורך ערך התוית \"{0}\" על פרימיטיב {1} חורג מאורך מקסימלי אפשרי {2}. אורך " +"הערך הוא {3}." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "נתונים" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "שכבה" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "בחירה" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "הורד" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "התקרב אל {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "קרב את התצוגה לכדי {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +619,30 @@ msgstr "תצוגה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "לא נבחר פריט להתקרבות." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "אין התנגשויות להתמקד בהם" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "שלב דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "שלב מספר דרכים לאחת." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "נא בחר לפחות שתי דרכים לשילוב." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "לשלב שתי דרכים בעלות חברויות שונות?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -456,13 +650,13 @@ msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "אחד בכל זאת" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "לשנות כיוונים?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -470,10 +664,10 @@ msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "הפוך כיוון ואחד" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -481,20 +675,20 @@ msgstr "הזן ערכים לכל ההתנגשויות." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "שלב {0} דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "כל הדרכים היו ריקות" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -511,23 +705,24 @@ msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "אנא בחר דבר מה להעתקה." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "צור עיגול" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "צור עיגול משלושה צמתים נבחרים" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "צמתים אלה אינם בעיגול." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -535,87 +730,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "מחק" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "מחק את הפריטים הנבחרים." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "שכתוב" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "הקובץ כבר קיים. לשכתב?" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "הורד מ-OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "הורד נתוני מפה משרת ה-OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "קובץ: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "הורד" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "אנא בחר לפחות משימה אחת להורדה" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "נמצאו {0} התנגשויות במהלך היבוא" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "שגיאות במהלך הורדה" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "שכפל" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "שכפל את הבחירה על ידי העתקה והדבקה מיידית." @@ -635,5 +865,5 @@ msgstr "צא מהיישום." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -641,58 +871,73 @@ msgstr "הערה: GPL אינו תואם לרשיון של OSM. אל תעלה מסלולים שרשיונם GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "ייצא ל-GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "ייצא נתונים לקובץ GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "אין מה לייצא. השג נתונים תחילה." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "תיאור מסלול GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "הוסף מידע על היוצר" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "שם אמיתי" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "זכויות יוצרים (כתובת)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "מוגדר מראש" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "שנת זכויות היוצרים" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "מילות מפתח" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "אפשרויות ייצוא" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "ייצא ושמור" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -703,25 +948,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "שגיאה" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "בחר רשיון המוגדר מראש" @@ -731,46 +956,49 @@ msgstr "עזרה מקוונת עבור JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "פתח בדפדפן" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "ערוך" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "טען מחדש" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "שגיאה בעת טעינת העמוד {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -806,30 +1034,40 @@ msgstr "צרף צומת למקטעי הדרך הקרובים ביותר" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "צרף צומת וקו" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "ללא קיצור" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "מזג בכל זאת" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "מיזוג צמתים" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "מזג את הצמתים לישנים ביותר." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "אנא בחר לפחות שני צמתים למיזוג." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "למזג צמתים בעלי חברויות שונות?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -838,68 +1076,79 @@ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "מזג בכל זאת" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "מזג {0} צמתים" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "בחירה" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "הזז מטה את החברים שנבחרו" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "שיקוף" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "שקף את הנקודות והדרכים הבחורות" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "נא לבחור לפחות נקודה אחת או דרך" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "למעלה" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "הזז פריטים {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "למטה" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "שמאלה" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "ימינה" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "הזז {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "הזז את הפריטים {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם." @@ -907,5 +1156,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "חדש" @@ -915,26 +1164,17 @@ msgstr "צור מפה חדשה." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "ללא שם" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "פתח..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "פתח קובץ." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "לא ניתן לקרוא את \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -963,41 +1203,41 @@ msgstr "כתובת הורדה" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "ישר זוויות צורה" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "מותרות רק שתי נקודות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "בחירה חייבת לכלול רק דרכים." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "בחר דרכים עם זווית כמעט ישרה ליישור" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "נבחרה רק נקודה אחת" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "יישר" @@ -1013,11 +1253,11 @@ msgstr "הדבק את תכני חוצץ ההדבקה." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "הדבק תגיות" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים." @@ -1045,16 +1285,21 @@ msgstr "בצע שוב את הפעולה האחרונה שבוטלה." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "שנה את שם השכבה" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "שנה גם את שם הקובץ" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "לא ניתן לשנות את שם הקובץ \"{0}\"." @@ -1068,9 +1313,9 @@ msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "אנא בחר לפחות דרך אחת." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "הפוך דרכים" @@ -1078,17 +1323,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "שמירה" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "שמור את הנתונים הנוכחיים." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "הקובץ {0} כבר קיים. לדרוס אותו?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1097,25 +1344,25 @@ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "מסמך ריק" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "המסמך לא מכיל נתונים" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "שמור בכל זאת" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "התנגשויות" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1125,54 +1372,75 @@ "להמשיך?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "דחה התנגשויות ושמור" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "שמור קובץ OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "שמור קובץ GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "שמור שכבה" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "לא יכול לגבות קובץ." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "סיומת קובץ לא מוכרת: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "אירעה שגיאה במהלך שמירה" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "סיומת הקובץ אינה ידועה." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "אירעה שגיאה במהלך שמירה" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "שמור בשם..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "שמור את המידע הנוכחי לקובץ חדש." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "בחר הכל" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1204,16 +1472,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "סגור" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "פצל דרך" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "פצל דרך בנקודה הבחורה." @@ -1223,5 +1491,5 @@ msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1229,5 +1497,5 @@ msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1239,9 +1507,9 @@ msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "הנקודות הבחורות אינן שייכות לאותה דרך." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1249,10 +1517,10 @@ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1260,17 +1528,17 @@ msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1291,56 +1559,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "שכפל נקודות המשותפות למספר דרכים." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "הנקודה לא מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "בחר:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1350,9 +1618,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "הפרד נקודה" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1360,5 +1628,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1374,139 +1642,90 @@ msgstr "בטל את הפעולה האחרונה." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "בטל את כל הבחירות" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "בטל את כל בחירות העצמים" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "עדכן נתונים" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "עדכון נכשל" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "לא נמצאה שכבת נתוני GPX" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "עדכן בחירה" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "בחירה ריקה" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "העלה ל-OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "העלה את כל השינויים לשרת ה-OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "פריטים להוספה:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "פריטים לשינוי:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "פריטים למחיקה:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "ספק הערה קצרה לשינויים שאתה מעלה:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "העלה את השינויים האלה?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "העלה שינויים" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "אין שינויים להעלאה." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "העלאה" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "סנכרן רק את {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "סנכרן את כל סט הנתונים" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1520,17 +1739,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "התגלתה התנגשות" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "ערך מוחזר לא צפוי. התקבל {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1541,54 +1760,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "הפרת תנאי מקדים" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "מסר יומי זמין" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- הגירסה שרצה היא {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "מוריד את \"המסר היומי\"" @@ -2972,62 +3366,57 @@ msgstr "סיסמא" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "שימוש" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "אפשרויות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "הצג עזרה זו" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "בחר עם החיפוש הנתון" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "אפס את המאפיינים לברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "קבע את השפה." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "דוגמאות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3035,51 +3424,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "מפעיל תוספים מעודכנים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "טען תוספים מוקדמים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "קביעת ברירות מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "טעינת תוספים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3087,21 +3476,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "מסך מלא" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "שמע" @@ -3145,53 +3534,68 @@ msgstr "הגדלה" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "קו האורך הגיאוגרפי בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "שם העצם בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "קו הרוחב הגיאוגרפי בסמן העכבר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "הזווית בין קטע הדרך הקודם לנוכחי" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "כיוון (המצפן) של קטע הדרך מצויר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "אורך קטע הדרך החדש מצויר." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(אין עצם)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "השכבה אינה ברשימה." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "יוצר קשר עם שרת ה-OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "שגיאה בעת פיענוח" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "קובץ לא נמצא" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3213,4 +3617,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "מאתחל" @@ -3242,20 +3647,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "תכונות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "תוויות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3263,47 +3668,47 @@ msgstr "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "נקודות (פתורות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "נקודות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "חברים (פתורים)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3311,25 +3716,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "חברים (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "תכונות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "פתרון התנגשות" @@ -3366,5 +3771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "הגירסה שלי" @@ -3375,5 +3780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3387,5 +3792,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "הגירסה שלהם" @@ -3468,7 +3873,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3542,14 +3946,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)" @@ -3578,10 +3982,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "אינדקס טור לא צפוי. התקבל {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3590,19 +3994,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "כן, בטל גם את המחיקה שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "לא, בטל את הפעולה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3611,9 +4015,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "בטל מחיקת נקודות נוספות?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3623,13 +4027,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3637,90 +4041,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "קואורדינטות:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(לא כלום)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "מחוק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "לא נמחק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "שמור את הקואורדינטות שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "שמור את הקואורדינטות שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3730,5 +4134,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3753,12 +4157,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3803,10 +4206,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3815,10 +4218,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3827,5 +4230,5 @@ msgstr "ערך" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3885,9 +4288,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3895,5 +4298,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3923,42 +4326,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "החל פתרון" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "המשך בכל זאת" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "המשך לפתור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, 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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "החל פתרון" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "החל פתרון חלקי" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "המשך לפתור" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "פתור התנגשות גירסאות ב-{0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3976,96 +4396,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "טען מחדש את כל העצמים הבחורים ורענן את הרשימה." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "שכבות" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "פתח רשימה המכילה את כל השכבות שנטענו." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "מחק את השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "ישנם שינויים לא שמורים. מחק את השכבה בכל זאת?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "מחק שכבה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "האם אתה באמת רוצה למחוק את כל השכבה?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "מידע" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "כן" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "צפון" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "מחק" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "מחק {0}{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "הצג/הסתר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "מחליף את המצב החזותי של השכבה הנבחרת." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "הצג\\הסתר טקסט\\סמלים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "שכבות" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "פתח רשימה המכילה את כל השכבות שנטענו." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "פרטי" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "מחק את השכבה הנבחרת." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "העבר את השכבה הנבחרת שורה אחת מעלה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "העבר את השכבה הנוכחית שורה אחת מטה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "שכבות: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "עוד מידע על הכלי הזה" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4074,22 +4528,28 @@ msgstr[1] "זה ישנה עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "ערך ריק מוחק את המפתח." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<שונה>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "לשנות ערכים?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4098,84 +4558,89 @@ msgstr[1] "שנה תכונות של עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "נא בחר מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "נא בחר ערך" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "תכונות\\חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "תכונות לעצמים שנבחרו." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "שנה יחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "באמת מחק את הבחירה מהיחס {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "הוסף" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "מחק מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "מחק את המפתח הנבחר בכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "תכונות: {0} \\ חברויות: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "תכונות \\ חברויות" @@ -4184,63 +4649,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "פתח רשימה של כל היחסים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "יחסים: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "פתח עורך עבור היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "מחק את היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "יחסים: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "פתח עורך עבור היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "מחק את היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "הבחירה הנוכחית" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "פתח חלון רשימת בחירה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "רענן את רשימת הבחירה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "התאם מיקוד לבחירה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "בחירה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4249,5 +4716,5 @@ msgstr[1] "{0} דרכים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4256,5 +4723,5 @@ msgstr[1] "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4265,148 +4732,420 @@ msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "מחברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "מחבר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "מחברים: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "הורדת איזור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "מחק את היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "הורד משטחים גלויים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "יחסים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "מוריד נתונים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "יחסים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "בצע שוב את הפעולה האחרונה שבוטלה." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "הזז את החברים הנבחרים מעלה" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "הזז מטה את החברים שנבחרו" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "הסר את כל העצמים הנבחרים מהיחס" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "מחק את היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "המשך לפתור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "יחס מתנגש" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "שמור את הנתונים הנוכחיים." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "אישור" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "הורד חברים" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "אשר פעולת שלט רחוק" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "התרחק" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "הזז מטה את החברים שנבחרו" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "החל שינויים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "בסיסי" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "תפוס ע\"י" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "העלה" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "הזז את החברים הנבחרים מעלה" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "הוסף את הנבחרים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "הוסף את כל העצמים הנבחרים כחברים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "הסרת הנבחרים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "הסר את כל העצמים הנבחרים מהיחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "הורד" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "הזז מטה את החברים שנבחרו" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "הורד חברים" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "עורך יחסים: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "נמצאו {0} התנגשויות במהלך היבוא" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "טען בחירה" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4416,5 +5155,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4424,25 +5163,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "סימניות" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "נא הזן את נקודות הציון הרצויות תחילה." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "נא הזן שם עבור המיקום." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "שנה מיקום" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "בחר סימניה תחילה." @@ -4476,34 +5212,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "מקורות מידע וסוגים" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "הורדה כשכבה חדשה" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "הורדת איזור" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "הורדת איזור גדול מידי; כנראה שתדחה ע\"י השרת" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "הורדת איזור בסדר; כנראה שתתקבל ע\"י השרת" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "נא הזן מחרוזת לחיפוש" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת" @@ -4511,5 +5247,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "הזן שם מקום לחיפוש:" @@ -4517,5 +5253,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4523,6 +5259,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "שם" @@ -4561,6 +5297,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4583,15 +5319,15 @@ msgstr "סוג" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "קרוב" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "מיקוד" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4600,5 +5336,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4630,5 +5366,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5370,5 +6112,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5535,59 +6277,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "תמונות עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "קורא GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "אין זמן לנקודה {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "קורא {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "תמונות בעלות גאותגיות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "התחלת GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "סיום GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "הפרש נוכחי: {0}ש'" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "הפרש אזורי הזמן: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5595,138 +6337,128 @@ msgstr[1] "תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} מתוך הרצועה." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "סנכרן שעון" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "תמונות JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "תמונה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "סנכרן את השעה עם יחידת ה-GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "לא ניתן לנתח את הזמן שהוזן." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "נקודת gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "התאם ציור קו" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "השתמש בהגדרות הגלובליות." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "צייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "אל תצייר קווים בין נקודות בשכבה זו." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "בחר אפשרויות ציור קו" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "התאם צבעים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "אישור" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "ברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "בחר צבע" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "סמנים מנקודות בעלות שם" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "ייבא שמע" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "קובץ שמע (wav.*)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "סמן שמע מ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "ייבא תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5735,5 +6467,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5742,5 +6474,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5749,30 +6481,30 @@ msgstr[1] "{0} נקודות דרך" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "שם: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "תיאור: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "אורך: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "המר לשכבת נתונים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5782,43 +6514,43 @@ "מסלולים, ראה כאן:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "המר מ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "הורד הכל עם:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} מטרים" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} קמ\"ר" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5829,9 +6561,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5839,5 +6571,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5847,47 +6579,47 @@ "באופן הגיוני הושמטו." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} נמחק/ו.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5912,5 +6644,5 @@ msgstr[1] "מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5918,5 +6650,5 @@ msgstr[1] "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5925,5 +6657,5 @@ msgstr[1] "מסלול בעל {0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5932,5 +6664,5 @@ msgstr[1] "{0} מורכב מ-{1} מסלולים" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5949,5 +6681,5 @@ msgstr[1] "סמנים" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5956,29 +6688,29 @@ msgstr[1] "{0} מורכב מ-{1} סמנים" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "סנכרן שמע" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5986,10 +6718,17 @@ msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "הצג\\הסתר טקסט\\סמלים" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5997,5 +6736,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6003,29 +6742,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "לא יכול ליצור סמן שמע חדש." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "היתה שגיאה בניסיון להציג את הכתובת לסמן זה" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(הכתובת היתה: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "שגיאה בהצגת URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "מאפיינים מתקדמים" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "קביעת ישירה של כניסות מאפיינים. השתמש בזהירות!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6033,26 +6772,26 @@ msgstr "חפש: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "ערך נוכחי הינו ברירת מחדל" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "ערך ברירת המחדל הוא \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "ערכי ברירת מחדל לא ידועים ברגע זה (קביעה לא היתה עדיין בשימוש)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "נא בחר את השורה לעריכה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6060,14 +6799,14 @@ msgstr "ערך חדש עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "נא בחר את השורה למחיקה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "הכנס צמד מפתח\\ערך חדש" @@ -6190,40 +6929,40 @@ msgstr "כיול רשם קול" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "צבע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "סגנון ציור {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "בחר" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "בחר צבע עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "צבעים בשימוש עצמים אחרים ב JOSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "צבעים" @@ -6551,46 +7290,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "התאם תוספים זמינים." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "הורד רשימה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "עדכן" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "התאם אתרים..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "בחר כניסה." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "התאם אתרי תוספים" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "הגדרות תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6598,29 +7345,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "הגדרות חיבור" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "הגדרות חיבור לשרת OSM" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "הגדרות מפה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "הגדרות שמע" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף." @@ -6721,59 +7468,61 @@ msgstr "קיצור-דרך" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "בחר שורה להעתקה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "מחק את המקור הנבחר מהרשימה" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6939,33 +7688,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "עוד מידע על הכלי הזה" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "מאפייני רשות:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "סוג לא ידוע: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6976,15 +7725,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -6994,18 +7743,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "שנה תכונות" @@ -7016,33 +7765,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "מתחבר לשרת OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "מוריד נקודות {0} עד {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "מוריד מידע של OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, כנראה שחסרים תגים." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "מכין נתונים..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "לא ניתן לקרוא את \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7050,21 +7802,21 @@ msgstr "קבצי GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "סמנים מהמיקום {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7080,10 +7832,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "מוריד מידע של OSM..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7091,48 +7862,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "קבצי NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "משפטים לא תקינים: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "שגיאות Checksum: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "משפטים לא ידועים: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "יבוא NMEA הסתיים בהצלחה" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "יבוא NMEA נכשל!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7141,15 +7911,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7157,23 +7927,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "מעלה..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "קורא ספרייה {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7216,9 +7999,4 @@ msgid "Login" msgstr "התחברות" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "מבטל..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7269,66 +8047,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "שגיאה בזמן הניתוח." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "קבצי שרת OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "גרסה לא ידוע" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "נמצא שלא בתוך דרך." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "ל אין התייחסות (ref)" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "עצם לא חוקי עם id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7336,51 +8118,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "מכין נתוני OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "מתחבר לשרת..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7389,16 +8204,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "עדכן תוספים" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7415,5 +8225,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7422,23 +8232,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7449,32 +8259,30 @@ msgstr "אירעה שגיאה בתוסף {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "אזהרה - התבקשה טעינת התוסף {0}. התוסף כבר לא נדרש." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "תוסף לא נמצא: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "התוסף עודכן לאחרונה לפני {0} ימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7484,21 +8292,21 @@ "'pluginmanager.warntime')." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "נטרל תוסף" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7508,5 +8316,5 @@ "הקיימים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7514,19 +8322,19 @@ msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "לפי המידע בתוסף, המחבר הוא {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "האם התוסף צריך ליהיות מנוטרל?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7534,25 +8342,23 @@ msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "מידע" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "מידע על התוסף לא נמצא." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "אין תיאור זמין" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7561,13 +8367,18 @@ msgstr[1] "הורד מידע על התוסף מ{0} אתרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "מידע על התוסף לא נמצא." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "כל התוספים המותקנים מעודכנים." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7580,9 +8391,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "הורד תוספים חסרים" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7595,57 +8406,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "לא ידוע" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: גירסא {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "תוסף ארוז עם JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "שגיאה בקריאת קובץ המידע של התוסף: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "זה לאחר סיום העריכה" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "שגיאה בניגון הצליל" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "אל תעשה כלום" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "דווח על תקלה" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7659,18 +8448,18 @@ "האחרונה של JOSM, היה נחמד ודווח על התקלה." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "שגיאה בלתי צפויה" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "אנא דווח על {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "כלול את הצעדים לקבלת השגיאה (בפירוט רב ככל האפשר)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7678,17 +8467,33 @@ msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "וודא שכללת את המידע הבא:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(הטקסט כבר הועתק ל-clipboard שלך)." -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "אל תציג שוב" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7701,5 +8506,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7709,5 +8514,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7718,13 +8523,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(טיפ: ניתן לערוך את הקיצורים ב\"מאפיינים\")" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7732,21 +8552,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7754,74 +8574,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "ציבורי" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "תיאור" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "מתחבר..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "שגיאה בזמן ההעלאה" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX הועלה בהצלחה" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "לא סופק שום תיאור. נא לספק תיאור." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "לא סופק שם משתמש." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "לא סופקה סיסמא." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7891,33 +8712,34 @@ msgstr "אחד מהקבצים הנבחרים היה null !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "קורא תמונות..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "קורא ספרייה {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "נמצא קובץ null בתיקייה {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7937,15 +8759,15 @@ msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "שגיאה בעת ניתוח {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7954,34 +8776,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "זמן צילום (מ-EXIF)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "זמן GPS (נקרא מהצילום למעלה): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "אני באזור זמן: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "אין תאריך" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "פתח תמונה אחרת" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7989,69 +8811,69 @@ msgstr "שגיאה בזמן ניתוח התאריך:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "תאריך שגוי" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "אזור זמן: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "היסט:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "עדכן מיקום עבור: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "כל התמונות" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "תמונות ללא מיקום exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "תמונות שעדיין לא תויגו" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8062,9 +8884,9 @@ "פורמט מצופה: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "אזור זמן שגוי" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8075,65 +8897,65 @@ "פורמט מצופה: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "היסט שגוי" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8141,13 +8963,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8169,5 +8991,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" @@ -8190,6 +9012,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8353,22 +9175,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8376,18 +9198,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8500,6 +9322,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "שכבה ריקה" @@ -8528,5 +9350,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8535,14 +9357,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8630,4 +9452,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "שום נתונים לא נטענו." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8638,9 +9465,9 @@ msgstr "ייצר דרך משוכפלת" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8761,30 +9588,30 @@ msgstr "מחק נתונים לאחר ייבוא" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "מייבא נתונים ממכשיר." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "מייבא נתונים מDG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "שגיאה במחירת נתונים." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "נתונים ביובאים מ-{0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "לא נמצאו נתונים על מכשיר." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "ההתחברות נכשלה." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8793,14 +9620,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "ייבא" @@ -8891,40 +9718,40 @@ msgstr "פתח תמונות עם ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "המיקום ההתחלתי נמצא מחוץ לתחום" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "מחפש קו חוף..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} נקודות עד כה..." +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "שגיאה ביצירת ספריית מטמון: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "בודק מטמון..." @@ -8933,26 +9760,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "מריץ הפחתת קודקודים..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "מריץ הערכת דאגלס-פאוקר..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "מוריד נקודות כפולות..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9037,7 +9856,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "מים" @@ -9185,9 +10004,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "מוריד משטח תמונה..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "לא יכול להשיג תמונה" @@ -9427,18 +10246,18 @@ msgstr "מצב פריט לא ידוע" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "פתח גלוי..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "פתח רק קבצים שנראים בתצוגה הנוכחית." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "אף תצוגה לא פתוחה - לא יכול לקבוע גבולות!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9464,33 +10283,33 @@ msgstr "קובץ הרצת פיירפוקס" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "טען נתונים מ API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "שנה את הבחירה" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "שנה נקודת מבט" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "אשר את כל פעולות השלט רחוק ידנית" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "שלט רחוק" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "כיוונונים לתוסף \"שלט רחוק\"" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9501,28 +10320,28 @@ "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "פעולות מורשות" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "שלט רחוק ביקש להוריד נתונים מה-API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "בקש פרטים: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "האם אתה רוצה לאשר את זה?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "אשר פעולת שלט רחוק" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:" @@ -9786,4 +10605,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10030,33 +10870,33 @@ msgstr "פותח דיאלוג שמאפשר לך לקפוץ למיקום מסויים" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "מיקוד (במטרים)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "כתובת" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "קפוץ לשם" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10088,6 +10928,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "שגיאת תקינות" @@ -10097,10 +10937,10 @@ msgstr "אין שגיאות תקינות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "שריג" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10189,23 +11029,15 @@ msgstr "בודק את תקינות הנתונים" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "נתונים עם שגיאות. להעלות בכל זאת?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "פתח חלון תקינות נתונים." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "התמקד בבעיה" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "בדוק תקינות" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10276,22 +11108,22 @@ msgstr "דרכים חוצות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "נקודות כפולות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "נקודות דרך כפולות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "מחפש דרכים עם נקודות עוקבות זהות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "נקודות דרך כפולות" @@ -10364,23 +11196,23 @@ msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "בודק תכונות:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "תוסף זה מחפש שגיאות במפתחות וערכים של תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10391,7 +11223,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "צירופי תווית \\ ערך לא חוקיים" @@ -10399,78 +11231,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "בעיית ציור" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "מפתח \"{0}\" לא תקין." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "תוויות עם ערכים ריקים" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "מפתח תכונה לא תקין" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "רווח לא תקין במפתח תכונה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "ערכי תכונות מתחילים או מסתיימים ברווח" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "בדוק מפתחות תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10478,82 +11312,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "הוסף מקור חדש לרשימה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "ערוך את המקור הנבחר" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "מקורות נתונים" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "בדוק ערכי תכונות." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "השתמש בברירת המחדל לקובץ בודק האיות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "תקן תכונות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "לא יכול למצוא את סוג האלמנט" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "לא יכול למצוא את דרגת האזהרה" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "ביטוי לא חוקי \"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10698,7 +11532,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "בניין" @@ -10712,5 +11546,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "שטח" @@ -10744,10 +11578,10 @@ msgstr "נקודת קצה מחוברת של דרך נמצאת ליד דרך אחרת" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "נקודות לא מחוברות וללא תוויות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "מבחן זה מחפש נקודות ללא תוויות שאינן חלק מדרך." @@ -10801,8 +11635,32 @@ msgstr "אדמה הפוכה: האדמה לא בצד שמאל" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0},..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10813,10 +11671,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10865,14 +11723,14 @@ msgstr "עזרת תוסף WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10883,26 +11741,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10910,5 +11768,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10918,5 +11776,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10925,107 +11783,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "הורדה אוטומטית" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "טען מחדש משטחים פגומים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "טען שכבת WMS מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "מאפייני תוסף WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "שם תפריט" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "כתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "שם תפריט (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "כתובת WMS (ברירת מחדל)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "הזן שם תפריט וכתובת WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "העתק ברירת מחדל" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11132,11 +11990,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11146,10 +12009,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11157,5 +12020,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11165,5 +12028,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11173,15 +12036,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11189,5 +12052,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11195,5 +12058,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11202,15 +12065,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11219,10 +12082,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11231,15 +12094,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11249,10 +12112,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11261,5 +12124,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11268,5 +12131,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11274,11 +12137,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12433,58 +13303,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12498,6 +13316,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12523,6 +13341,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12548,6 +13366,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "ראשי" @@ -12573,6 +13391,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "משני" @@ -12586,5 +13404,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "שלישוני" @@ -12602,5 +13420,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "מגורים" @@ -12634,6 +13452,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "שירות" @@ -12660,6 +13478,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "בנייה" @@ -12709,5 +13527,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "כיכר" @@ -13686,5 +14504,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "ביצה" @@ -15415,27 +16233,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "ספורט" @@ -18274,7 +19092,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "אופניים" @@ -18344,7 +19162,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "רגל" @@ -18370,5 +19188,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "רכבת תחתית" @@ -18859,13 +19677,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "מיושן" @@ -18907,5 +19725,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "סוס" @@ -19125,4 +19943,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "סירת מנוע" + #. color tertiary #. @@ -19157,6 +20037,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "רחוב" @@ -19212,7 +20092,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19268,8 +20148,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19290,5 +20170,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19302,5 +20182,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19321,5 +20201,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19334,5 +20214,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19347,5 +20227,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "גדת נחל" @@ -19359,5 +20239,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "זרם" @@ -19371,5 +20251,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19397,5 +20277,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "אקוודוקט" @@ -19563,13 +20443,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "מעשה אדם" @@ -19631,7 +20511,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19654,10 +20534,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19693,7 +20573,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19738,6 +20618,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19751,5 +20631,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "מסוף" @@ -19771,5 +20651,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19783,5 +20663,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19829,7 +20709,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19846,5 +20726,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "מסלול קל" @@ -19859,5 +20739,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "מסלול בינוניים" @@ -19872,5 +20752,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "מסלול מתקדמים" @@ -19885,5 +20765,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19898,5 +20778,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19911,5 +20791,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "מסלול מתחילים" @@ -20014,10 +20894,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "תחנת כח" @@ -20031,5 +20911,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "מזח" @@ -20043,5 +20923,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "צינור" @@ -20169,12 +21049,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "פנאי" @@ -20188,5 +21068,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20258,8 +21138,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20361,10 +21241,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20750,22 +21630,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20797,6 +21677,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20857,8 +21737,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "בריאות" @@ -21211,26 +22091,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "חנות" @@ -21302,8 +22182,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "מלון" @@ -21453,9 +22333,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "תיירות" @@ -21527,8 +22407,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "היסטורי" @@ -21599,8 +22479,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "ירוק" @@ -21614,5 +22494,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "מחצבה" @@ -21626,5 +22506,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21646,5 +22526,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21658,5 +22538,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "יער" @@ -21670,5 +22550,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21691,5 +22571,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "קמעוני" @@ -21703,5 +22583,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "תעשייתי" @@ -21715,5 +22595,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21727,5 +22607,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21739,5 +22619,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21794,7 +22674,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "צבאי" @@ -21808,5 +22688,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "בית עלמין" @@ -21819,5 +22699,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "פיסגה" @@ -21832,5 +22712,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "קרחון" @@ -21844,5 +22724,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "הר געש" @@ -21897,8 +22777,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "טבעי" @@ -21912,5 +22792,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21924,5 +22804,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -21936,5 +22816,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -21948,5 +22828,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "בוץ" @@ -21960,5 +22840,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "חוף" @@ -22036,8 +22916,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22085,7 +22965,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "גבול" @@ -22227,10 +23107,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "מקום" @@ -22278,6 +23158,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "כתובת" @@ -22574,10 +23454,27 @@ msgstr "" +#~ msgid "Update failed" +#~ msgstr "עדכון נכשל" + +#~ msgid "Apply partial resolutions" +#~ msgstr "החל פתרון חלקי" + +#~ msgid "Layers: {0}" +#~ msgstr "שכבות: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה." + +#~ msgid "Validate" +#~ msgstr "בדוק תקינות" + #~ msgid "Data Layer" #~ msgstr "שכבת נתונים" -#~ msgid "Uploading data" -#~ msgstr "מעלה נתונים" - #~ msgid "Not implemented yet." #~ msgstr "עדיין לא הוטמע." @@ -22592,6 +23489,12 @@ #~ msgstr "ארעו התנגשויות במהלך הייבוא." -#~ msgid "Object" -#~ msgstr "פריט" +#~ msgid "Contacting the OSM server..." +#~ msgstr "יוצר קשר עם שרת ה-OSM..." + +#~ msgid "their version:" +#~ msgstr "הגירסה שלהם:" + +#~ msgid "resolved version:" +#~ msgstr "הגירסה הפתורה:" #~ msgid "{0} object has conflicts:" @@ -22603,60 +23506,9 @@ #~ msgstr "הגירסה שלי:" -#~ msgid "their version:" -#~ msgstr "הגירסה שלהם:" - -#~ msgid "resolved version:" -#~ msgstr "הגירסה הפתורה:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "שם כניסה (אי-מייל) לחשבון OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "שם משתמש OSM (אי-מייל)" - -#~ msgid "Unknown host" -#~ msgstr "מארח לא ידוע" - -#~ msgid "position" -#~ msgstr "מיקום" - -#~ msgid "different" -#~ msgstr "שונה" - -#~ msgid "true" -#~ msgstr "אמת" - -#~ msgid "false" -#~ msgstr "שקר" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "פתור {0} התנגשויות ב{1} עצמים" - -#~ msgid "Change" -#~ msgstr "שנה" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "לחץ \"טען מחדש\" כדי לרענן את הרשימה" - -#~ msgid "Revert" -#~ msgstr "להחזיר לקדמותו" - -#~ msgid "Date" -#~ msgstr "תאריך" - -#~ msgid "Rotate" -#~ msgstr "סובב" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "תוויות (ערך ריק מוחק את התווית)" - -#~ msgid "Error parsing server response." -#~ msgstr "שגיאה בניתוח תשובת השרת." - -#~ msgid "Cannot connect to server." -#~ msgstr "לא יכול להתחבר לשרת" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה." +#~ msgid "Object" +#~ msgstr "פריט" + +#~ msgid "unnamed" +#~ msgstr "ללא שם" #~ msgid "" @@ -22669,61 +23521,75 @@ #~ msgstr "הערת ביצוע" -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} תוסף עודכן בהצלחה. נא לאתחל את JOSM." -#~ msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "לא יכול להוריד תוסף: {0} מ{1}" +#~ msgid "Aborting..." +#~ msgstr "מבטל..." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "תוסף דורש את עדכון JOSM: {0}." + +#~ msgid "Occupied By" +#~ msgstr "תפוס ע\"י" + +#~ msgid "Add Selected" +#~ msgstr "הוסף את הנבחרים" + +#~ msgid "Cannot connect to server." +#~ msgstr "לא יכול להתחבר לשרת" + +#~ msgid "Error parsing server response." +#~ msgstr "שגיאה בניתוח תשובת השרת." + +#~ msgid "Revert" +#~ msgstr "להחזיר לקדמותו" + +#~ msgid "Date" +#~ msgstr "תאריך" + +#~ msgid "OSM username (email)" +#~ msgstr "שם משתמש OSM (אי-מייל)" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "שגיאה במחיקת קובץ התוסף: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "התוסף כבר קיים" + +#~ msgid "Import TCX File..." +#~ msgstr "ייבא קובץ TCX..." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "כמה מהנקונות הן (כמעט) באותו קו" + +#~ msgid "Rotate" +#~ msgstr "סובב" + +#~ msgid "Change" +#~ msgstr "שנה" + +#~ msgid "position" +#~ msgstr "מיקום" + +#~ msgid "false" +#~ msgstr "שקר" + +#~ msgid "true" +#~ msgstr "אמת" + +#~ msgid "different" +#~ msgstr "שונה" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "התאם את מיקום שכבת WMS" #~ msgid "Navigation" #~ msgstr "ניווט" -#~ msgid "image not loaded" -#~ msgstr "תמונה לא נטענה" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "התאם את מיקום שכבת WMS" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "תוסף דורש את עדכון JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "התוסף כבר קיים" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "שגיאה במחיקת קובץ התוסף: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "כמה מהנקונות הן (כמעט) באותו קו" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "ייבא קובץ TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "ייבא קובץ TCX כמסלולי GPS" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.
הסיסמא " -#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.
אל תשתמש בסיסמא בעלת ערך." -#~ "" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "שם כניסה (אי-מייל) לחשבון OSM." + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית" #~ msgid "" @@ -22740,9 +23606,87 @@ #~ msgstr "התנגשויות: {0}" -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית" +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "תוויות (ערך ריק מוחק את התווית)" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "לחץ \"טען מחדש\" כדי לרענן את הרשימה" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "ייבא קובץ TCX כמסלולי GPS" + +#~ msgid "image not loaded" +#~ msgstr "תמונה לא נטענה" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} תוסף עודכן בהצלחה. נא לאתחל את JOSM." +#~ msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "לא יכול להוריד תוסף: {0} מ{1}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "פתור {0} התנגשויות ב{1} עצמים" + +#~ msgid "Remove Selected" +#~ msgstr "הסרת הנבחרים" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "הוסף את כל העצמים הנבחרים כחברים" + +#~ msgid "Basic" +#~ msgstr "בסיסי" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.
הסיסמא " +#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.
אל תשתמש בסיסמא בעלת ערך." +#~ "" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?" #~ msgid "sports" #~ msgstr "ספורט" + +#~ msgid "Undeleting Way..." +#~ msgstr "ביטול מחיקת דרך..." + +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "בודק האם נקודה {0} נעלמה..." + +#~ msgid "Undeleting relation..." +#~ msgstr "ביטול מחיקת יחס..." + +#~ msgid "Keep mine" +#~ msgstr "שמור את שלי" + +#~ msgid "Delete mine" +#~ msgstr "מחק את שלי" + +#~ msgid "Selection too big" +#~ msgstr "בחירה גדולה מידי" #~ msgid "" @@ -22752,27 +23696,13 @@ #~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה." -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?" - -#~ msgid "Undeleting Way..." -#~ msgstr "ביטול מחיקת דרך..." - -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "בודק האם נקודה {0} נעלמה..." - -#~ msgid "Undeleting relation..." -#~ msgstr "ביטול מחיקת יחס..." - -#~ msgid "Keep mine" -#~ msgstr "שמור את שלי" - -#~ msgid "Delete mine" -#~ msgstr "מחק את שלי" - -#~ msgid "Selection too big" -#~ msgstr "בחירה גדולה מידי" +#~ msgid "Move Up" +#~ msgstr "העלה" #~ msgid "Error when communicating with server." #~ msgstr "שגיאה בהתקשרות עם השרת." + +#~ msgid "Move Down" +#~ msgstr "הורד" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "עורך יחסים: {0}" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 16826) +++ /applications/editors/josm/i18n/po/is.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 17:42+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-29 17:07+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Bý til aðal notandaviðmót" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Hjálp" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Óvistaðar breytingar" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Vista og hætta" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Hunsa og hætta" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Hætta við" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Aðvörun" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Um JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Sýna upplýsingar um JOSM." @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Síðast breytt {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Vefsíða." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Villutilkynningar" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Upplýsingar" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Lestu mig" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Útgáfa" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Höfundar" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Leyfi" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Viðbætur" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Um JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Skrá fannst ekki." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -211,16 +355,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Aðvörun" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -229,7 +366,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Veldu hlut til að eyða fyrst." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Eyða laginu" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Sameina hnúta" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Bæta við hnút..." @@ -241,72 +406,74 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format msgid "Edit: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +msgstr "Breyti: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Sláðu inn hnit fyrir nýja hnútinn." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Nota tugabrotsgráður." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Breiddargráða" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Lengdargráða" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Raða hnútum í hring" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Raða völdum hnútum í hring." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -320,27 +487,60 @@ #, java-format msgid "Tool: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +msgstr "Tól: {0}" + +#: ../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:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Raða hnútum í línu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Raða völdum hnútum í beina línu." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -349,18 +549,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -369,5 +561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -376,46 +568,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "gögnum" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "lagi" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "vali" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "árekstri" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "niðurhali" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Þysja að {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Þysja að {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -425,30 +617,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Ekkert er valið til að þysja að." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Sameina vegi sem eru stak í mismunandi venslum?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -458,13 +650,13 @@ "það?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +msgstr "Sameina þá" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +msgstr "Skipta um átt?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -474,10 +666,10 @@ "haldist sér. Vilt þú skipta um átt sumra þeirra?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Skipta um átt og sameina" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -485,20 +677,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Leysa árekstra" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Sameina {0} vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -517,23 +709,23 @@ msgstr "Afrita valda hluti á klemmuborðið." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Veldu eithvað til að afrita" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Búa til hring" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Búa til hring úr þrem völdum hnútum." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +msgid "Those nodes are not in a circle. Aborting." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -541,87 +733,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Fjarlægja" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Eyða völdum hlutum." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +msgstr "Yfirskrifa" + +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" -msgstr "" +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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Dreifa hnútum jafnt" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 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:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Skrá: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Niðurhala" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Vensl rekast á" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Tvöfalda" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Tvöfalda valið með því að afrita það og líma það aftur." @@ -641,5 +868,5 @@ msgstr "Hætta í forritinu." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -647,58 +874,73 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Vista sem GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Vista gögnin í GPX sniði." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Ekkert til að vista. Opnaðu gögn fyrst." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "lýsing á gps ferli" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Bæta við höfundaupplýsingum" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nafn" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -707,25 +949,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Villa" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "" @@ -735,46 +957,49 @@ msgstr "JOSM vefhjálp" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Opna í vafra" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Breyta" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Endurhlaða" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -810,30 +1035,40 @@ msgstr "Tengir endahnút á vegi við nálægan veg" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Endurnefna lag" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum." + +#: ../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:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -843,68 +1078,79 @@ "það?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "vali" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Spegla" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Spegla valda hnúta og vegi." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 +#, java-format +msgid "Move objects {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +msgid "down" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +msgid "left" +msgstr "" + +#. dir == Direction.RIGHT) { #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 -#, java-format -msgid "Move objects {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "" @@ -912,5 +1158,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Ný" @@ -920,25 +1166,16 @@ msgstr "Skapa nýtt kort." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "ónefnt" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Opna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Opna skrá." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" msgstr "" @@ -968,41 +1205,41 @@ msgstr "Niðurhala slóð" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Hornrétta form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "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:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Aðeins einn hnútur valinn" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Hornrétta" @@ -1018,11 +1255,11 @@ msgstr "Líma innihald klemmuborðsins." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Líma eigindi" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti." @@ -1050,16 +1287,21 @@ msgstr "Endurtaka afturkallaða aðgerð." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Endurnefna lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Endurnefna skránna líka" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Gat ekki endurnefnt skránna „{0}“." @@ -1073,9 +1315,9 @@ msgstr "Skipta um átt allra valdra vega." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Skipta um átt vega" @@ -1083,17 +1325,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Vista" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Vista þau gögn sem sjást núna." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +msgstr "Skráin {0} er þegar til. Yfirskrifa hana?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1101,25 +1345,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tómt skjal" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Árekstrar" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1127,54 +1371,75 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Vista OSM skrá" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Vista GPX skrá" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, java-format +msgid "Could not back up file. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Óþekkt skráarending: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Óþekkt skráarending" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" +msgstr "Villa kom upp: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Vista sem..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Vista þau gögn sem sjást núna í nýja skrá." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Velja allt" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1207,16 +1472,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Loka" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Skipta veg" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Skipta veg á völdum hnút(um)." @@ -1226,5 +1491,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1232,5 +1497,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1242,9 +1507,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1252,10 +1517,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1263,17 +1528,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1294,56 +1559,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1353,9 +1618,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1363,5 +1628,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1377,140 +1642,90 @@ msgstr "Afturkalla síðustu aðgerð." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Afvelja allt" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Afvelja alla hluti." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Uppfæra gögn" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" "Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir þau." -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "Uppfæra val" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Upphala til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Upphala öllum breytingum á OSM þjóninn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Hlutum sem verður bætt við:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Hlutum sem verður breytt:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Hlutum sem verður eytt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Hlaða upp breytingum?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Hlaða upp breytingum" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Engar breytingar til að hlaða upp." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1524,17 +1739,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1545,53 +1760,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Upphala öllum breytingum á OSM þjóninn." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Hlutum sem verður bætt við:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Hlutum sem verður breytt:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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 "" @@ -1647,9 +1873,9 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17 msgid "Next Marker" -msgstr "" +msgstr "Næsti punktur" #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16 msgid "Play next marker." -msgstr "" +msgstr "Spila næsta punkt." #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18 @@ -1665,5 +1891,5 @@ #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17 msgid "Previous Marker" -msgstr "" +msgstr "Fyrri punktur" #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16 @@ -1680,42 +1906,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Sæki GPS gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +msgstr "Niðurhöluð GPX gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "GPS gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Sæki gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +msgstr "Ekki var náð í nein gögn" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Hleð upp gögnum" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1727,21 +1965,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Eyða hnútum eða vegum" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1749,5 +1987,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1755,747 +1993,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Teikna hnúta og vegi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "Get ekki bætt við hnút handan endamarka veraldar." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Bæta við hnút" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Bæta hnút við veg" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Búa til svæði" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Val" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Velja, færa og snúa hlutum" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Þysja" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Þysja og hliðra korti" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Leita..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Leita að hlutum." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Engin göng eru hlaðin til að vinna með." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Sláðu inn leitarstreng" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "skipta út vali" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "bæta við val" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "fjarlæga úr vali" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "stafsetursnæmt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regluleg segð" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Gamla Hringbraut - „Gamla“ og „Hringbraut“ í einhverjum lykli og " -"gildi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -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:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Gam - „Gam“ kemur fyrir í nafninu." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - lykillinn „type“ með hvaða gildi sem er. Prófaðu einnig " -"*=gildi, type=, *=* og *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -msgid "foot: - key=foot set to any value." -msgstr "foot: - Lykillinn „foot“ með eitthvað gildi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "Sérleitir:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - Gerð hlutarins; node, way og relation " -"fyrir hnút, veg og vensl" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - Hlutur með gefið kenni (e. „id“)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - Hlutum sem breytt hefur verið" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - Valdir hlutir" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - Ókláraðir hlutir" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - Hlutir án eiginda" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -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:101 -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:102 -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:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Notaðu \" til að eyða tvíræðni, t.d. ef lykill eða gildi inniheldur " -"„:“ eða „ “" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Notaðu ( og ) til að sameina segðir" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Leit" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Hefja leit" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "stafsetursnæmt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "stafsetursónæmt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 -msgid "Load Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41 -#, java-format -msgid "Contact {0}..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Sæki..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Gat ekki lesið frá veffang: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Vensl rekast á" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n" -"Eyða úr venslunum?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Fjarlægja úr venslum" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "Valið „{0}“ er notað af venslunum „{1}“." - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað." -"
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu " -"verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "hnútur" -msgstr[1] "hnútar" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Vensl" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Ekki vista breytingar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2507,7 +2021,784 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Teikna hnúta og vegi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "Get ekki bætt við hnút handan endamarka veraldar." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "Bæta við hnút" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Bæta hnút við veg" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Búa til svæði" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Val" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Velja, færa og snúa hlutum" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Þysja" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Þysja og hliðra korti" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Leita..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Leita að hlutum." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Sláðu inn leitarstreng" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "skipta út vali" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "bæta við val" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "fjarlæga úr vali" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "stafsetursnæmt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regluleg segð" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"Gamla Hringbraut - „Gamla“ og „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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - lykillinn „type“ með hvaða gildi sem er. Prófaðu einnig " +"*=gildi, type=, *=* og *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Sérleitir:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - Gerð hlutarins; node, way og relation " +"fyrir hnút, veg og vensl" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +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: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 +msgid "modified - all changed objects" +msgstr "modified - Hlutum sem breytt hefur verið" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - Valdir hlutir" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - Ókláraðir hlutir" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - Hlutir án eiginda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +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 +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 +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 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Notaðu \" til að eyða tvíræðni, t.d. ef lykill eða gildi inniheldur " +"„:“ eða „ “" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Leit" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Hefja leit" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "stafsetursnæmt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "stafsetursónæmt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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/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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Leysa árekstra" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, java-format +msgid "Add conflict for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "" + +#: ../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 +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?" +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:584 +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?" +msgstr "Valið „{0}“ er notað af venslunum „{1}“." + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað." +"
Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu " +"verið að nota þá.
Ertu viss um að þú viljir eyða þeim?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Fjarlægja úr venslum" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "hnútur" +msgstr[1] "hnútar" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Vensl" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Ekki vista breytingar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2536,5 +2827,5 @@ msgstr "A" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2543,27 +2834,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "óklárað" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Villa: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Viðvörun: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "hnútar" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2571,13 +2862,13 @@ msgstr[1] "vegir" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2585,22 +2876,22 @@ msgstr[1] "vensl" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2614,23 +2905,23 @@ msgstr[1] "{0} stök" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vatnsfarvegur" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2685,5 +2976,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2821,9 +3112,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2840,5 +3126,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "bakgrunnur" @@ -2849,8 +3135,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2861,5 +3147,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "" @@ -2882,22 +3168,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Gat ekki lesið bókamerki." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Gat ekki skrifað bókamerki." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Ekki sýna þessi skilaboð aftur" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "óskilgreint" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Óvænt villa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +#, fuzzy +msgid "Unknown host" +msgstr "Óþekkt útgáfa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Ekki var hægt að ná í skilaboð dagsins" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "{0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "" @@ -2972,62 +3364,57 @@ msgstr "Lykilorð" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3035,51 +3422,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Virki uppfærðar viðbætur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Hleð inn viðbótum" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Skrá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Tól" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Forstillingar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3087,21 +3474,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Möskvahamur" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Fara í möskvaham" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Fylla skjá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Fara í fullskjáham" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Hljóð" @@ -3145,53 +3532,68 @@ msgstr "skali" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Lengdargráðan undir músabendlinum." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Breiddargráðan undir músabendlinum." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(enginn hlutur)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "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 @@ -3213,4 +3615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Upphafsstilli" @@ -3242,20 +3645,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Tögg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3263,47 +3666,47 @@ msgstr "Hnútar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Stök" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3311,25 +3714,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3366,5 +3769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3375,5 +3778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3387,5 +3790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3460,7 +3863,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3534,14 +3936,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3570,10 +3972,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3582,19 +3984,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3603,9 +4005,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3615,13 +4017,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3629,90 +4031,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3722,5 +4124,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3745,12 +4147,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3795,10 +4196,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3807,10 +4208,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3819,5 +4220,5 @@ msgstr "Gildi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3877,9 +4278,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3887,5 +4288,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3915,42 +4316,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Sameina þá" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Leysa breytingarárekstra" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3968,96 +4386,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Sýna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Sýna breytingasögu valdra hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Lög" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Eyða völdu lagi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Það eru óvistaðar breytingar. Eyða laginu þrátt fyrir það?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Eyða laginu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Ert þú viss um að þú viljir eyða öllu laginu?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Upplýsingar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "já" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Fjarlægja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, java-format +msgid "Deleting layer {0} of {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Sýna/Fela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Sýna eða fela valið lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Lög" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "einkavegur" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Eyða völdu lagi." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Færa valið lag niður í röðinni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Lög: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Fræðsluskilti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4066,22 +4518,28 @@ msgstr[1] "Allt að {0} hlutum verður breytt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Tómt gildi eyðir lyklinum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4090,84 +4548,89 @@ msgstr[1] "Breyta eigindum allt að {0} hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Veldu lykil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Veldu gildi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Veldu hluti til að breyta eigindum þeirra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Eigindi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Eigindi valdra hluta." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Breyta venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Eyða valinu úr venslunum {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Bæta við" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Breyta gildi valins lykils í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Eyða eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Eyða völdum lykil í öllum völdum hlutumaccess" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "" @@ -4176,63 +4639,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Sýna lista yfir vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Eyða völdum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Skapa ný vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Eyða völdum venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Núverandi val" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Opna vallistann." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Þysja að völdum hlut(um)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Þysja að vali" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Val: Vensl:{0} / Vegir:{1} / Nódur:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Val" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4241,5 +4706,5 @@ msgstr[1] "{0} vegir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4248,5 +4713,5 @@ msgstr[1] "{0} vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4257,5 +4722,10 @@ msgstr "Opna þessa stiku sem glugga" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4264,143 +4734,409 @@ "vinstri tólastikunni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Smelltu til að minnka/hámarka innihald stikunnar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Höfundar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Listi yfir notendur sem breyttu síðast völdum hlutum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Notandi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "Fjöldi hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Niðurhalssvæði" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Eyða völdum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Niðurhala sýnilega reiti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Sæki gögn" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "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 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "Hlutverk:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Endurtaka afturkallaða aðgerð." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Sýna breytingasögu valdra hluta" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Færa valda meðlimi upp" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Færa valda meðlimi niður" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Fjarlægja valda meðlimi úr venslunum" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Eyða völdum venslum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Vensl rekast á" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Vista þau gögn sem sjást núna." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Vista" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "Í lagi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Bæta við tómu taggi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Eyða völdum töggum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +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:1263 +msgid "Download Members" +msgstr "Niðurhala meðlimum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "Vistar hlutverk fyrir völd stök" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "Vista hlutverk" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Þysja út" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Færa valda meðlimi niður" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Vista breytingar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Grunnupplýsingar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Gengt af" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "tengd" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Færa upp" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Færa valda meðlimi upp" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Bæta við vali" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Bæta völdum hlutum við venslin" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Fjarlægja val" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Fjarlægja valda meðlimi úr venslunum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Raða" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Raða völdum meðlimum eða öllum listanum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Færa niður" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Færa valda meðlimi niður" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Fjarlægja val úr venslunum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Niðurhala meðlimum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "Stök: {0} (tengd: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Breyti nýjum venslum í laginu „{0}“" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Breyti venslum #{0} í laginu „{1}“" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "vensl" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4410,5 +5146,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4418,25 +5154,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bókamerki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Sláðu inn hnitin fyrst" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Sláðu inn nafn fyrir staðsetningu." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "bæta við val" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Veldu fyrst bókmerki" @@ -4471,34 +5204,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Gagnabankar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Sækja sem nýtt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Niðurhalssvæði" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Niðurhalssvæði er of stórt. Verður sennilega hafnað af þjóni" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Stærð niðurhalssvæðis er ok, stærð sennilega ásættanleg fyrir þjón" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Sláðu inn leitarstreng" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni" @@ -4506,5 +5239,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Sláðu inn nafn á stað til að leita að" @@ -4512,5 +5245,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4518,6 +5251,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nafn" @@ -4556,6 +5289,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4578,15 +5311,15 @@ msgstr "gerð" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "nálægt" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "þysja" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4595,5 +5328,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Gagnvirkt kort" @@ -4625,5 +5358,11 @@ msgstr "Breytingaskrá: {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Loka þessum glugga" @@ -5365,5 +6104,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5532,59 +6271,59 @@ msgstr "Útgáfa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Les {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5592,138 +6331,128 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Samstilla klukkur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG myndir (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Sérsníða teikningu lína" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Sérsníða liti" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "Í lagi" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Veldu lit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Flytja inn hljóð" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Flytja inn myndir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5732,5 +6461,5 @@ msgstr[1] "{0} ferlar, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5739,5 +6468,5 @@ msgstr[1] "{0} leiðir, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5746,30 +6475,30 @@ msgstr[1] "{0} punktar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Tímaspan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lengd: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Breyta í gagnalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5777,43 +6506,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5822,9 +6551,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5832,5 +6561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5838,47 +6567,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5903,5 +6632,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5909,5 +6638,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5916,12 +6645,12 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" msgid_plural "{0} consists of {1} tracks" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +msgstr[0] "{0} samanstendur af {1} feril" +msgstr[1] "{0} samanstendur af {1} ferlum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5940,36 +6669,36 @@ msgstr[1] "punktar" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" msgid_plural "{0} consists of {1} markers" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +msgstr[0] "{0} samanstendur af {1} punkt" +msgstr[1] "{0} samanstendur af {1} punktum" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5977,10 +6706,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Sýna/Fela texta og táknmyndir" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5988,5 +6724,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -5994,29 +6730,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Stillingarritill" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6024,26 +6760,26 @@ msgstr "Leita: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +msgstr "Veldu hlut til að breyta fyrst." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6051,16 +6787,16 @@ msgstr "Nýtt gildi fyrir {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +msgstr "Veldu hlut til að eyða fyrst." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" -msgstr "" +msgstr "Bættu við nýjum eigindum" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33 @@ -6181,40 +6917,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Litur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +msgstr "Velja lit" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +msgstr "Veldu lit fyrir „{0}“" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Litir" @@ -6546,46 +7282,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Stillingar fyrir viðbætur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +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 msgid "Update" msgstr "Uppfæra" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +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 msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +msgstr "Bæta við viðbótarþjóni." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +msgstr "Vinsamlegast veldu viðbótarþjón til að fjarlægja." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +msgstr "Breyta viðbótarþjóni." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Bæta við viðbótarþjóni." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" -msgstr "" +msgstr "Stilla viðbótarþjóna" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Birtingarstillingar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6593,29 +7338,29 @@ msgstr "Stillingar sem hafa áhrif á útlit forritsins" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Tengistillingar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Stillingar sem þarf til að tengjast OSM þjóninum." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Kortastillingar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Stillingar tengdar kortavörpun og gagnatúlkun." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Hljóðstillingar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6718,59 +7463,61 @@ msgstr "Flýtileið" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +msgstr "Veldu hlut til að afrita fyrst." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6936,33 +7683,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Frekari upplýsingar um þessa forstillingu" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Valfrjáls eigind:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Nota forstillinguna „{0}“" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6973,15 +7720,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -6991,18 +7738,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Breyta eigindum" @@ -7013,74 +7760,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Hef samband við OpenStreetMap miðlara..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Hala niður punktum {0} til {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 +#. SAXException does not chain correctly +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgid "NullPointerException, possibly some missing tags." +msgstr "Tómur bendill, hugsanvega vantar einhver eigindi." + +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 +msgid "Preparing data..." +msgstr "Undirbý gögn..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 +#, java-format +msgid "Markers from {0}" +msgstr "Punktar frá {0}" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#, java-format +msgid "File \"{0}\" does not exist" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#, java-format +msgid "Parsing file \"{0}\" failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 +msgid "Parse error: invalid document structure for gpx document" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#, java-format +msgid "no primitive with id {0} in local dataset. Can't infer primitive type" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 msgid "Downloading OSM data..." msgstr "Hala niður OSM gögnum..." -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 -msgid "NullPointerException, possibly some missing tags." -msgstr "Tómur bendill, hugsanvega vantar einhver eigindi." - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 -msgid "Preparing data..." -msgstr "Undirbý gögn..." - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../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 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 -#, java-format -msgid "Markers from {0}" -msgstr "Punktar frá {0}" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#, java-format -msgid "File \"{0}\" does not exist" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 -#, java-format -msgid "Parsing file \"{0}\" failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 -msgid "Parse error: invalid document structure for gpx document" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 -#, java-format -msgid "no primitive with id {0} in local dataset. Can't infer primitive type" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7088,48 +7857,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "" -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7138,15 +7906,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7154,23 +7922,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Opna breytingasett..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Hleð upp gögnum..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, java-format +msgid "Starting retry {0} of {1}." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7213,9 +7994,4 @@ msgid "Login" msgstr "Innskrá" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Hætti við..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7266,66 +8042,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Óþekkt útgáfa" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +msgstr "Óþekkt útgáfa: {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Ógildur hlutur með kenni=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7333,46 +8113,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Atriði merkt \"{0}\" vantar" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Undirbý OSM gögn..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Illa-formað kenni á hnút" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Hef samband við þjóninn..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7380,5 +8180,18 @@ "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7387,18 +8200,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} búið. Hleð upp: {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Uppfæra viðbætur" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" -msgstr "" +msgstr "Hala niður viðbótum" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55 @@ -7413,30 +8221,34 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM." msgstr[0] "" +"Náð var í {0} viðbót. Vinsamlegast endurræstu JOSM til að nota nýju " +"viðbótina." msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +"Náð var í {0} viðbætur. Vinsamlegast endurræstu JOSM til að nota nýju " +"viðbæturnar." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7447,32 +8259,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, 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 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Viðbótin „{0}“ fannst ekki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Síðasta uppfærsa viðbóta var framkvæmd fyrir meira en {0} dögum." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7480,27 +8290,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Gera viðbótina óvirka" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "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:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " "overwrite the existing ones." msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +"Ekki tókst að virkja nýju viðbæturnar. Tryggðu að JOSM hafi réttndi til að " +"yfirskrifa núverandi viðbætur." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7508,19 +8320,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7528,40 +8340,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" msgstr "Upplýsingar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" msgid_plural "Downloaded plugin information from {0} sites" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +msgstr[0] "Halaði niður lista yfir viðbætur frá {0} þjóni" +msgstr[1] "Halaði niður lista yfir viðbætur frá {0} þjónum" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +msgstr "Allar innsettar viðbætur eru af nýjustu útgáfu." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7574,9 +8389,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +msgstr "Hala niður nýjum viðbótum" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7585,58 +8400,39 @@ "{0}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +"Hala niður eftirfarand viðbótum?\n" +"\n" +"{0}" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Útgáfa {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Þetta er eftir enda upptöku" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Villa við að spila hljóð" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Gera ekkert" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Senda villutilkynningu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7650,14 +8446,14 @@ "útgáfuna af JOSM, vinsamlegast sendu þá inn villumeldinguna." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Óvænt villa" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Vinsamlegast sendu meldinguna á {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7665,5 +8461,5 @@ "nákvæmt og hægt er)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7673,17 +8469,33 @@ "tilkynnir um villu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Vertu viss um að láta eftirfarandi upplýsingar fylgja:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "Textinn hefur verið þegar verið afritaður" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Ekki sýna þessi skilaboð aftur" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7696,5 +8508,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7704,5 +8516,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7713,13 +8525,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Ráð: Þú getur breytt flýtileiðum í valkostum)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7727,21 +8554,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Upphala feril" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7749,9 +8576,9 @@ msgstr "Upphala ferlum" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Sýnilegur öllum" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" @@ -7760,65 +8587,66 @@ #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Lýsing" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Ferill: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 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:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7839,14 +8667,14 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" -msgstr "" +msgstr "Fyrri" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 msgid "Remove photo from layer" -msgstr "" +msgstr "Fjarlægja myndina úr laginu" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" -msgstr "" +msgstr "Næsta" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 @@ -7884,33 +8712,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7930,15 +8759,15 @@ msgstr "GPX skrár (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7947,34 +8776,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7982,69 +8811,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8053,9 +8882,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8064,65 +8893,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8130,13 +8959,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8144,5 +8973,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433 msgid "No image" -msgstr "" +msgstr "Engin mynd" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443 @@ -8158,5 +8987,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -8179,6 +9008,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8342,22 +9171,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8365,18 +9194,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8489,6 +9318,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Tómt lag" @@ -8517,5 +9346,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8524,14 +9353,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8619,4 +9448,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Engin göng eru hlaðin til að vinna með." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8627,9 +9461,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8750,30 +9584,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8782,14 +9616,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -8837,9 +9671,9 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108 msgid "Previous image" -msgstr "" +msgstr "Fyrri mynd" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next image" -msgstr "" +msgstr "Næsta mynd" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144 @@ -8880,40 +9714,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -8922,26 +9756,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -8949,5 +9775,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10 msgid "An unknown error has occurred" -msgstr "" +msgstr "Óþekkt villa kom upp" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18 @@ -9026,7 +9852,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "vatn" @@ -9171,9 +9997,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9413,18 +10239,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9449,33 +10275,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9484,28 +10310,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9769,4 +10595,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10013,33 +10860,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10071,6 +10918,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Villur sem fundust við athugun" @@ -10080,10 +10927,10 @@ msgstr "Engar villur fundust við athugun" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10170,23 +11017,15 @@ msgstr "Athuga gögnin" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Gögnin stóðust ekki athugun. Upphala þrátt fyrir það?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Opna athugunarglugga." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Þysja að vandamálinu" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Athuga" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Athuga núverandi val eða öll gögn í laginu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10257,22 +11096,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Hnútur endurtekinn í vegi." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Hnútur endurtekinn í vegi" @@ -10345,23 +11184,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10370,7 +11209,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10378,78 +11217,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10457,82 +11298,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10677,7 +11518,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "bygging" @@ -10691,5 +11532,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10723,10 +11564,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10780,7 +11621,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10792,10 +11657,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10844,14 +11709,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10862,26 +11727,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10889,5 +11754,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10897,5 +11762,5 @@ msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10904,109 +11769,109 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Sjálfvirkt niðurhal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Vista WMS lag í skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Stillingar fyrir WMS viðbótina" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +msgstr "Afrita sjálfgefið val á minn lista" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" -msgstr "" +msgstr "Niðurhalsforrit:" #. * @@ -11109,11 +11974,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11123,10 +11993,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11134,5 +12004,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11142,5 +12012,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11150,15 +12020,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11166,5 +12036,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11172,5 +12042,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11179,15 +12049,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11196,10 +12066,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11208,15 +12078,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11226,10 +12096,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11238,5 +12108,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11245,5 +12115,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11251,11 +12121,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -11723,5 +12600,5 @@ #: build/trans_presets.java:145 build/trans_presets.java:161 msgid "Motorroad" -msgstr "" +msgstr "Hraðbrautarlíkar aðgangstakmarkanir" #. item "Streets/Trunk" check "Embankment" @@ -11925,5 +12802,5 @@ #: build/trans_presets.java:658 build/trans_presets.java:1290 msgid "paved" -msgstr "" +msgstr "malbikaður" #: build/trans_presets.java:240 build/trans_presets.java:258 @@ -11934,5 +12811,5 @@ #: build/trans_presets.java:658 build/trans_presets.java:1290 msgid "unpaved" -msgstr "" +msgstr "ómalbikaður" #. item "Ways/Track Grade 2" combo "Surface" @@ -11947,5 +12824,5 @@ #: build/trans_presets.java:658 build/trans_presets.java:1290 msgid "cobblestone" -msgstr "" +msgstr "götusteinn" #. item "Streets/Residential" text "Width (meters)" @@ -11986,13 +12863,13 @@ #: build/trans_presets.java:269 msgid "alley" -msgstr "" +msgstr "port" #: build/trans_presets.java:269 msgid "driveway" -msgstr "" +msgstr "heimreið" #: build/trans_presets.java:269 msgid "parking_aisle" -msgstr "" +msgstr "bílastæðavegur" #. item "Streets/Service" text "Width (meters)" @@ -12000,5 +12877,5 @@ #: build/trans_presets.java:282 msgid "Parking Aisle" -msgstr "" +msgstr "Bílastæðavegur" #. item @@ -12008,5 +12885,5 @@ #: build/trans_presets.java:286 msgid "Edit Parking Aisle" -msgstr "" +msgstr "Breyti bílastæðaveg" #. @@ -12021,5 +12898,5 @@ #: build/trans_presets.java:299 msgid "Edit Road of unknown type" -msgstr "" +msgstr "Breyti veg af óþekktri flokkun" #. item "Streets/Road (Unknown Type)" text "Width (meters)" @@ -12142,5 +13019,5 @@ #: build/trans_presets.java:631 build/trans_style.java:203 msgid "private" -msgstr "" +msgstr "einkavegur" #: build/trans_presets.java:320 build/trans_presets.java:321 @@ -12223,5 +13100,5 @@ #: build/trans_presets.java:631 build/trans_style.java:196 msgid "permissive" -msgstr "" +msgstr "leyfður" #: build/trans_presets.java:320 build/trans_presets.java:324 @@ -12237,5 +13114,5 @@ #: build/trans_presets.java:631 msgid "agricultural" -msgstr "" +msgstr "í landbúnaðarskyni" #: build/trans_presets.java:320 build/trans_presets.java:321 @@ -12383,5 +13260,5 @@ #: build/trans_presets.java:343 msgid "Edit Junction" -msgstr "" +msgstr "Breyti hringtorgi" #. item "Streets/Roundabout" label "Edit Junction" @@ -12410,58 +13287,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12475,6 +13300,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "hraðbraut" @@ -12482,5 +13307,5 @@ #: build/trans_presets.java:346 msgid "motorway_link" -msgstr "" +msgstr "tengibraut á hraðbraut" #. color motorway @@ -12500,6 +13325,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "stofnvegur" @@ -12525,6 +13350,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12550,6 +13375,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12563,5 +13388,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12579,5 +13404,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "íbúðargata" @@ -12611,8 +13436,8 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" -msgstr "" +msgstr "þjónustuvegur" #: build/trans_presets.java:346 @@ -12637,6 +13462,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "byggingarsvæði" @@ -12649,5 +13474,5 @@ #: build/trans_presets.java:364 msgid "Edit Bridge" -msgstr "" +msgstr "Breyti brú" #. item @@ -12674,5 +13499,5 @@ #: build/trans_presets.java:408 msgid "Junction" -msgstr "" +msgstr "Hringtorg" #. item "Ways/Construction" combo "Junction" @@ -12686,5 +13511,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "hringtorg" @@ -13160,5 +13985,5 @@ #: build/trans_presets.java:787 msgid "Mini-roundabout" -msgstr "" +msgstr "Smáhringtorg" #. item @@ -13169,10 +13994,10 @@ #: build/trans_presets.java:792 msgid "Direction" -msgstr "" +msgstr "Átt" #. item "Waypoints/Mini-roundabout" combo "Direction" #: build/trans_presets.java:792 msgid "clockwise" -msgstr "" +msgstr "réttsælis" #: build/trans_presets.java:794 @@ -13663,5 +14488,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -13739,5 +14564,5 @@ #: build/trans_presets.java:1150 msgid "Ferry Route" -msgstr "" +msgstr "Siglingarleið ferju" #. item @@ -15000,10 +15825,10 @@ #: build/trans_presets.java:1793 msgid "Stadium" -msgstr "" +msgstr "Íþróttaleikvangur" #. item #: build/trans_presets.java:1794 msgid "Edit Stadium" -msgstr "" +msgstr "Breyti íþróttaleikvang" #. item "Sport Facilities/Stadium" text "Name" @@ -15392,27 +16217,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "íþrótt" @@ -15440,5 +16265,5 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "australian_football" -msgstr "" +msgstr "ástralskur fótbolti" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15505,5 +16330,5 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "football" -msgstr "" +msgstr "fótbolti" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15550,5 +16375,5 @@ #: build/trans_presets.java:1818 build/trans_presets.java:1827 msgid "shooting" -msgstr "" +msgstr "skotfimi" #: build/trans_presets.java:1800 build/trans_presets.java:1809 @@ -15616,10 +16441,10 @@ #: build/trans_presets.java:1829 msgid "Golf Course" -msgstr "" +msgstr "Golfvöllur" #. item #: build/trans_presets.java:1830 msgid "Edit Golf Course" -msgstr "" +msgstr "Breyti golfvelli" #. item "Sport Facilities/Golf Course" text "Name" @@ -15719,5 +16544,5 @@ #: build/trans_presets.java:2043 build/trans_presets.java:2049 msgid "sports_centre" -msgstr "" +msgstr "íþróttamiðstöð" #: build/trans_presets.java:1845 build/trans_presets.java:1851 @@ -15739,5 +16564,5 @@ #: build/trans_presets.java:2043 build/trans_presets.java:2049 msgid "stadium" -msgstr "" +msgstr "íþróttaleikvangur" #: build/trans_presets.java:1847 @@ -15926,5 +16751,5 @@ #: build/trans_presets.java:1940 msgid "Shooting" -msgstr "" +msgstr "Skotfimi" #. item @@ -15932,5 +16757,5 @@ #: build/trans_presets.java:1942 msgid "Edit Shooting" -msgstr "" +msgstr "Breyti skotfimi" #: build/trans_presets.java:1948 @@ -18251,7 +19076,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "hjól" @@ -18321,7 +19146,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "fótgangandi" @@ -18347,5 +19172,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -18836,13 +19661,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -18884,5 +19709,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19102,4 +19927,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Hraðbrautarlíkar aðgangstakmarkanir" + #. color tertiary #. @@ -19134,6 +20021,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "stræti" @@ -19189,7 +20076,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19245,8 +20132,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19267,5 +20154,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19279,5 +20166,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19298,5 +20185,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "beygjuhringur" @@ -19311,5 +20198,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19324,5 +20211,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "árbakki" @@ -19336,5 +20223,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "lækur" @@ -19348,5 +20235,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19374,5 +20261,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19540,13 +20427,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19608,7 +20495,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19631,10 +20518,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19670,7 +20557,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19715,6 +20602,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19728,5 +20615,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19748,5 +20635,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19760,5 +20647,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19806,7 +20693,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "skíðalyfta" @@ -19823,5 +20710,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19836,5 +20723,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19849,5 +20736,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19862,5 +20749,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19875,5 +20762,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19888,5 +20775,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -19991,10 +20878,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20008,5 +20895,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "bryggja" @@ -20020,5 +20907,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "leiðsla" @@ -20146,12 +21033,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "frístundir" @@ -20165,5 +21052,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "smábátahöfn" @@ -20235,8 +21122,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20338,10 +21225,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20727,22 +21614,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20774,6 +21661,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20834,8 +21721,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21188,26 +22075,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21279,8 +22166,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hótel" @@ -21430,9 +22317,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "ferðamennska" @@ -21504,8 +22391,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21576,8 +22463,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21591,5 +22478,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21603,5 +22490,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21623,5 +22510,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21635,5 +22522,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "skógur (ræktaður)" @@ -21647,5 +22534,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21668,5 +22555,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "smásala" @@ -21680,5 +22567,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "iðnaður" @@ -21692,5 +22579,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21704,5 +22591,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21716,5 +22603,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21771,7 +22658,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21785,5 +22672,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21796,5 +22683,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "tindur" @@ -21809,5 +22696,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "jökul" @@ -21821,5 +22708,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "eldfjall" @@ -21874,8 +22761,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -21889,5 +22776,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21901,5 +22788,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -21913,5 +22800,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "skógur" @@ -21925,5 +22812,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "leðja" @@ -21937,5 +22824,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "strönd" @@ -22013,8 +22900,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22062,7 +22949,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22204,10 +23091,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22255,6 +23142,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22551,39 +23438,40 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Gagnalag" - -#~ msgid "Uploading data" -#~ msgstr "Hleð upp gögnum" +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst." + +#~ msgid "Layers: {0}" +#~ msgstr "Lög: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Fjarlægja val úr venslunum" + +#~ msgid "Validate" +#~ msgstr "Athuga" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Athuga núverandi val eða öll gögn í laginu." + +#~ msgid "Aborting..." +#~ msgstr "Hætti við..." + +#~ 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 "Email" -#~ msgstr "Netfang" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Leysa breytingarárekstra" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} hlutur hefur árekstra:" -#~ msgstr[1] "{0} hlutir hafa árekstra:" - #~ msgid "OSM username (email)" #~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Leysa {0} árekstra í {1} hlutum" - -#~ msgid "Revert" -#~ msgstr "Afturkalla" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." +#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" #~ msgid "" @@ -22594,14 +23482,45 @@ #~ "reyna síðar." +#~ msgid "Email" +#~ msgstr "Netfang" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Bæta völdum hlutum við venslin" + +#~ msgid "unnamed" +#~ msgstr "ónefnt" + +#~ msgid "Conflicts: {0}" +#~ 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:" +#~ msgstr[0] "{0} hlutur hefur árekstra:" +#~ msgstr[1] "{0} hlutir hafa árekstra:" + +#~ msgid "Server does not support changesets" +#~ msgstr "Þjónn styður ekki breytingasett" + #~ msgid "Commit comment" #~ msgstr "Staðfesta umsögn" -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." -#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" +#~ msgid "sports" +#~ msgstr "íþróttir" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)" + +#~ msgid "Add Selected" +#~ msgstr "Bæta við vali" + +#~ msgid "Remove Selected" +#~ msgstr "Fjarlægja val" #~ msgid "" @@ -22612,22 +23531,40 @@ #~ "músina. Velja: Smellið" +#~ msgid "Revert" +#~ msgstr "Afturkalla" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." + +#~ msgid "Data Layer" +#~ msgstr "Gagnalag" + #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Leiðrétta stöðu WMS lagsins" +#~ msgid "Occupied By" +#~ msgstr "Gengt af" + #~ msgid "Charge" #~ msgstr "Gjaldtaka" -#~ msgid "Server does not support changesets" -#~ msgstr "Þjónn styður ekki breytingasett" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#~ msgid "Conflicts: {0}" -#~ msgstr "Árekstrar: {0}" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna." - -#~ msgid "sports" -#~ msgstr "íþróttir" +#~ msgid "Move Up" +#~ msgstr "Færa upp" + +#~ msgid "Move Down" +#~ msgstr "Færa niður" + +#~ msgid "Sort" +#~ msgstr "Raða" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Raða völdum meðlimum eða öllum listanum" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Stök: {0} (tengd: {1})" + +#~ msgid "linked" +#~ msgstr "tengd" + +#~ msgid "Basic" +#~ msgstr "Grunnupplýsingar" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 16826) +++ /applications/editors/josm/i18n/po/it.po (revision 16827) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 17:15+0000\n" -"Last-Translator: FabC \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-18 17:43+0000\n" +"Last-Translator: simone \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,21 +13,28 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Creazione dell'interfaccia principale" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -35,5 +42,75 @@ "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Errore" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -41,57 +118,60 @@ "server." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Modifiche non salvate" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" "Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Salva ed Esci" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Annulla ed Esci" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -100,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Annulla" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Attenzione" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Informazioni su JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Mostra le informazioni sul programma." @@ -133,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -144,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -151,19 +291,19 @@ msgstr "Versione {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Ultima modifica {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java versione {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Pagina iniziale" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Segnalazione errori" @@ -173,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Informazioni" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Leggimi" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisione" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Contributi" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Estensioni" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Informazioni su JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Impossibile trovare il file." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -215,16 +359,9 @@ "probabilmente non funzionerà. L' URL di base per le api è: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Selezionare almeno un nodo, percorso o relazione già caricato." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Attenzione" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -235,7 +372,35 @@ "delle {1} primitive selezionate" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Scegli la riga da cancellare." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Selezionare uno di questi:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Fondi nodi" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Aggiungi nodo..." @@ -247,14 +412,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -262,57 +429,57 @@ msgstr "Modifica: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Inserire le coordinate per il nuovo nodo." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Usa i gradi decimali." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valori negativi denotano l'emisfero Occidentale/Meridionale." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitudine" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Disponi i nodi in cerchio" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Sposta i nodi selezionati disponendoli su un cerchio." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -328,25 +495,58 @@ msgstr "Strumenti: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Selezionare almeno quattro nodi." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Disponi i nodi in linea" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Sposta i nodi selezionati disponendoli su una linea." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Selezionare almeno tre nodi." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -357,18 +557,10 @@ "sono {0}, il massimo è {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Violazione delle capacità delle API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Inizializzazione delle API fallita" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -379,5 +571,5 @@ "cancellata {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -388,9 +580,9 @@ "massima lunghezza ammessa {2}. La lunghezza del valore è {3}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Violazione della precondizione" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" @@ -399,37 +591,37 @@ "permesso {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "dati" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selezione" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflitto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "scarica" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Fa lo zoom della vista a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -439,30 +631,30 @@ msgstr "Visualizza: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Nessuna selezione da ingrandire" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Unire i percorsi con diverse appartenenze?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -472,13 +664,13 @@ "unirli?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Unisci comunque" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Inverti direzione?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -488,10 +680,10 @@ "la direzione di qualcuno?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Inverti direzione e unisci" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -499,20 +691,20 @@ msgstr "Inserire dei valori per tutti i conflitti." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Unisci {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Tutti i percorsi erano vuoti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -531,23 +723,24 @@ msgstr "Copia gli oggetti selezionati all'interno del buffer" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Seleziona qualcosa da copiare." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Crea cerchio" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Crea un cerchio a partire da tre nodi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Questi nodi non sono disposti in cerchio" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -557,87 +750,122 @@ "due o tre nodi." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Cancella" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Cancella gli oggetti selezionati." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Sovrascrivi" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Disponi i nodi" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 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:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "File: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Scarica" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Selezionare almeno un compito per scaricare" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Ci sono stati {0} conflitti durante l'importazione" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Errori durante lo scaricamento" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplica" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplica la selezione copiando ed incollalo subito." @@ -657,5 +885,5 @@ msgstr "Esci dall'applicazione." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -665,58 +893,73 @@ "con licenza GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Esporta in GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Esporta i dati in un file GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Niente da esportare. Prima è necessario ottenere dei dati." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "descrizione della traccia GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Aggiungi informazioni sull'autore" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nome reale" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Diritto d'autore (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefinito" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright anno" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Parole chiave" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opzioni di esportazione" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Esporta e Salva" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -727,25 +970,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Errore" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Scegliere una licenza predefinita" @@ -755,47 +978,50 @@ msgstr "Guida in linea di JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Apri nel Browser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Modifica" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Ricarica" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Errore durante il caricamento della pagina {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Pagina di help mancante. Creala in italiano." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -835,30 +1061,40 @@ msgstr "Unisci un nodo al percorso più vicino" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Unisci il nodo e il percorso" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Nessuna scorciatoia" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Incorpora comunque" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Unisci il layer direttamente nel layer selezionato sotto" + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -867,68 +1103,79 @@ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Incorpora comunque" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Unisci {0} nodi" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selezione" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Aggiorna le primitive attualmente selezionate dal server" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Rispecchia" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Rispecchia i nodi ed i percorsi selezionati." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Selezionare almeno un nodo o percorso." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "su" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Sposta oggetti {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "giù" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "sinistra" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "destra" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Muovi {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Sposta Oggetti {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Impossibile spostare degli oggetti fuori dal mondo." @@ -936,5 +1183,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nuovo" @@ -944,26 +1191,17 @@ msgstr "Crea una nuova mappa." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "Senza nome" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Apri..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Apri un file." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Impossibile leggere \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -992,36 +1230,37 @@ msgstr "Scarica URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Disponi ortogonalmente" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Sono permessi solo due nodi" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "La selezione deve comprendere solo percorsi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Si sta utilizzando la proiezione EPSG:4326 che potrebbe portare
a " @@ -1029,9 +1268,9 @@ "proiezione per non ottenere più questo avvertimento.
Si vuole continuare?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Solo un nodo selezionato" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Disponi ortogonalmente" @@ -1047,11 +1286,11 @@ msgstr "Incolla il contenuto memorizzato" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Incolla le etichette" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati" @@ -1079,16 +1318,21 @@ msgstr "Rifa l'ultima azione annullata." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Rinomina livello" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Rinomina anche il file" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Impossibile rinominare il file \"{0}\"." @@ -1102,9 +1346,9 @@ msgstr "Inverti la direzione di tutti i percorsi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Selezionare almeno un precorso." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Inverti la direzione dei percorsi" @@ -1112,17 +1356,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Salva" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Salva i dati attuali." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Il file {0} esiste. Sovrascrivere?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1132,25 +1378,25 @@ "questo come bug." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Nessun documento è aperto per cui non c'è niente da salvare." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Documento vuoto" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Il documento non contiene dati" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Salva comunque" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflitti" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1160,54 +1406,77 @@ "gestiti come se si fossero stati tutti rifiutati. Continuare?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Rifiuta i conflitti e Salva" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Salva file OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Salva in un file GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Salva livello" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Impossibile creare una copia di backup." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Estensione del file sconosciuta: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"E'' stato generato un errore durante la comunicazione con il " +"server
Dettagli: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Errore durante il ripristino di un file di backup." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "L'estensione del file è sconosciuta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Si è verificato un errore durante il salvataggio." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Errore durante il ripristino di un file di backup." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Salva come..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Salva i dati correnti su un nuovo file." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Seleziona tutto" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1242,16 +1511,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Chiudi" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Dividi percorso" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Divide un percorso al nodo selezionato." @@ -1261,5 +1530,5 @@ msgstr "La selezione attuale non può essere usata per la divisione." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1267,5 +1536,5 @@ msgstr[1] "I nodi selezionati non sono parte di alcun percorso." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1281,9 +1550,9 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "I nodi selezionati non condividono il medesimo percorso." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1291,10 +1560,10 @@ msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Seleziona due o più nodi per dividere un percorso circolare." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1304,8 +1573,9 @@ "seleziona i nodi in mezzo al percorso)." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "L'appartenenza ad una relazione basata su regole è stata copiata a tutti i " @@ -1313,13 +1583,14 @@ "Controllare ed eventualmente correggere." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "L'appartenenza ad una relazione è stata copiata su tutti i nuovi percorsi.\n" "Verificare e correggere dove necessario." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1340,47 +1611,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Selezionare uno di questi:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Un nodo etichettato, oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Un nodo che è usato da più di un percorso, oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1389,5 +1660,5 @@ "oppure" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1396,5 +1667,5 @@ "percorso." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1409,9 +1680,9 @@ "e tutti i nodi saranno selezionati." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Nodo staccato" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1419,5 +1690,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1433,29 +1704,29 @@ msgstr "Annulla l'ultima azione." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Deseleziona tutto" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Toglie la selezione da tutti gli oggetti." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Deseleziona tutto (al centro)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Deseleziona tutto (al di fuori)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Aggiorna dati" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" @@ -1463,115 +1734,65 @@ "dati)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Non è stato trovato alcun dato da aggiornare. E' stato già aperto o " -"scaricato un livello dati?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Nessun dato" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "E' fallito il tentativo di aggiornare le primitive selezionate." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Aggiornamento fallito" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Non è stato trovato alcun livello dei dati GPX." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "" "Non è possibile trovare la primitiva con identificativo {0} nell'insieme di " "dati locale corrente" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Primitiva mancante" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Aggiorna la selezione" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Aggiorna le primitive attualmente selezionate dal server" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Selezione vuota" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Carica su OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Carica tutti i cambiamenti sul server OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Oggetti da aggiungere:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Oggetti da modificare:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Oggetti da eliminare:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Caricare questi cambiamenti?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Carica le modifiche" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Nessun cambiamento da caricare." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Invio in corso" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Aggiornamento della primitiva" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizza solamente {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Sincronizza l'intero dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1594,17 +1815,17 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Rilevato un conflitto" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "Valore di ritorno inatteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1620,5 +1841,5 @@ "continuare ad apportare delle modifiche.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1627,53 +1848,61 @@ "atteso \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Violazione della precondizione" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitiva già eliminata" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +"L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +msgstr "Upload fallito.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Invio alle API di OSM fallito" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Aggiornamento della primitiva" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Carica tutti i cambiamenti sul server OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " -"{0}.\n" -"Controllare l''indirizzo URL del server nelle proprie preferenze e la " -"propria connessione ad internet." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Oggetti da aggiungere:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Oggetti da modificare:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1761,43 +1990,55 @@ msgstr "Avanzamento lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Scaricamento dei dati GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Scarica dati GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Dati GPS grezzi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Scaricamento dei dati" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Nessun dato importato." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Dati OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Scaricamento di {0} su {1} ({2} rimanenti)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Caricamento dei dati" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "" "Sono stati generati i seguenti errori durante lo scaricamento di massa:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Errori durante lo scaricamento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1809,21 +2050,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Primitive eliminate o spostate" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Modalità Cancella" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Cancella nodi o percorsi." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1831,5 +2072,5 @@ msgstr "Modalità: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1840,791 +2081,23 @@ "gli oggetti che si riferiscono a questo." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Disegna" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Disegna i nodi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Modalità: Disegna centro" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "selezionato" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Aggiungi nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Aggiungi un nodo al percorso" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Collega un percorso esistente al nodo" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Aggiungi un nodo al percorso e connetti" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Crea un nuovo nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Seleziona il nodo sotto il cursore." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Inserisci un nuovo nodo nel percorso." -msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Inizia un nuovo percorso dall'ultimo nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Continua un percorso dall'ultimo nodo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Termina tracciamento." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Estrudi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Crea aree" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Estrudi il percorso" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" -"Rilascia il bottone del mouse per selezionare gli oggetti contenuti nel " -"rettangolo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone " -"del mouse." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Rilascia il bottone del mouse per interrompere la rotazione." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "" -"Trascina il segmento un segmento di un percorso per disegnare un rettangolo." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Trascinare la testina e rilasciarla in prossimità di un tracciato per " -"riprodurre l'audio da quel punto; premere SHIFT ed in contemporanea " -"rilasciare il tasto del mouse per sincronizzare l'audio in corrispondenza di " -"quel punto." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Seleziona" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Seleziona, muovi e ruota gli oggetti." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Aggiungi e sposta un nuovo nodo virtuale sul percorso" -msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Muovi elementi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" -"Si sono mossi più di {0} elementi. Muovere un grande numero di elementi è " -"spesso dovuto ad un errore.\n" -"Si è sicuri di volerli muovere?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Muoverli" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Annullare lo spostamento" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Rilasciare il pulsante del mouse per fermarsi. Ctrl per unire con il nodo " -"più vicino." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Spostare gli oggetti trascinandoli; Shift per aggiungere alla selezione " -"(Ctrl per togliere); Shift-Ctrl per ruotare i selezionati; oppure modificare " -"la selezione" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Ridimensiona e muovi la mappa" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl" -"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Cerca..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Cerca degli oggetti." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Nessun dato caricato." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Inserire una stringa di ricerca." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "Sostituisci la selezione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "Aggiungi alla selezione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "Rimuovi dalla selezione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "Distingui maiuscole" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "espressione regolare" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -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:85 -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:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - chiave 'type' contenente qualsiasi valore. Prova anche " -"*=value, type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Ricerche speciali:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - tutti gli oggetti modificati dall''utente" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - oggetto con un dato ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - tutti gli oggetti modificati" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - tutti gli oggetti selezionati" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - tutti gli oggetti incompleti" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - tutti gli oggetti provi di proprietà" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" -"figlio espressione - tutti i figli degli oggetti " -"corrispondenti all'espressione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" -"genitore espressione - tutti i genitori degli oggetti " -"corrispondenti all'espressione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" -"Utilizzare | oppure OR per combinare secondo l''operatore " -"logico ''or''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Utilizzare \" per racchiudere gli operatori (es. se la chiave " -"contiene :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Utilizzare ( e ) per raggruppare le espressioni" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Cerca" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Inizia Ricerca" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Nessuna corrispondenza trovata per ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Trovate {0} corrispondenze" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"L''espressione regolare \"{0}\" contiene un errore di interpretazione alla " -"posizione {1}, errore completo:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"La chiave non può essere vuota quando è utilizzato un operatore sulla " -"etichetta. Esempio di utilizzo: key=value" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Tipo di primitiva sconosciuta: {0}. I valori permessi sono: nodo, percorso o " -"relazione" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Token inaspettato: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Argomenti mancanti per l'operatore booleano OR." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Argomento mancante per l'operatore booleano NOT." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Era attesa una parentesi chiusa." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Numero errato di parametri per operatore sui nodi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Valore non corretto per l''operatore sui nodi: {0}. L'operatore sui nodi " -"richiede un numero o un intervallo di nodi, per esempio nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Collegamento a {0} in corso..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Scaricamento in corso..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Impossibile leggere \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Errore durante la comunicazione con il server" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "Aggiungere {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "Cambiare {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Rimuovi \"{0}\" per {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Imposta {0}={1} per {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "oggetto" -msgstr[1] "oggetti" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Rimuovi \"{0}\" per {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Imposta {0}={1} per {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "Cambiare il membro della relazione per {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" -"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " -"disponibile" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Risolvi conflitti nelle coordinate in {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "non è possibile risolvere il conflitto irrisolto" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Cancella {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Cancella {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Conflitto tra relazioni" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n" -"Cancellare dalla relazione?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Elimina dalla relazione" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"La selezione \"{0}\" è usata dalla relazione \"{1}\".\n" -"Cancellare dalla relazione?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Dividi il segmento del percorso" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Stai per cancellare dei nodi fuori dall'area scaricata.
Questo potrebbe " -"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti " -"(che non puoi vedere).
Vuoi veramente cancellarli?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Risolvi conflitti nello stato eliminato in {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Sposta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nodo" -msgstr[1] "nodi" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Eliminazione di 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "rimozione del riferimento dal percorso {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "rimozione del riferimento dalla relazione {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, 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 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Ruota {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Sequenza" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Risolvi i conflitti di versione per {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "Il set di dati principale non include il node {0}" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Applicare?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Invertendo la direzione di questo percorso si consiglia di apportare i " -"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la " -"consistenza dei dati." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relazione" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Vecchia regola" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nuova regola" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Chiave precedente" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Valore precedente" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nuova chiave" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nuovo valore" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Applica i cambiamenti selezionati" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Non applicare cambiamenti" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Proprietà di " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Regole nelle relazioni a cui si riferiscono" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Correzione automatica etichette" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Impossibile aprire la cartella delle preferenze: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"Il file delle preferenze contiene degli errori. Copia di backup del vecchio " -"file su {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Preferenze salvate in {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Impossibile caricare le preferenze. Motivo: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Impossibile scaricare le preferenze dal server." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2636,8 +2109,829 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Disegna" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Disegna i nodi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "selezionato" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Aggiungi nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Aggiungi un nodo al percorso" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Collega un percorso esistente al nodo" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Aggiungi un nodo al percorso e connetti" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Crea un nuovo nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Seleziona il nodo sotto il cursore." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Inserisci un nuovo nodo nel percorso." +msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Inizia un nuovo percorso dall'ultimo nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Continua un percorso dall'ultimo nodo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Termina tracciamento." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Estrudi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Crea aree" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Estrudi il percorso" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" +"Rilascia il bottone del mouse per selezionare gli oggetti contenuti nel " +"rettangolo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone " +"del mouse." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Rilascia il bottone del mouse per interrompere la rotazione." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "" +"Trascina il segmento un segmento di un percorso per disegnare un rettangolo." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Trascinare la testina e rilasciarla in prossimità di un tracciato per " +"riprodurre l'audio da quel punto; premere SHIFT ed in contemporanea " +"rilasciare il tasto del mouse per sincronizzare l'audio in corrispondenza di " +"quel punto." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Seleziona" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Seleziona, muovi e ruota gli oggetti." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Aggiungi e sposta un nuovo nodo virtuale sul percorso" +msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Muovi elementi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Si sono mossi più di {0} elementi. Muovere un grande numero di elementi è " +"spesso dovuto ad un errore.\n" +"Si è sicuri di volerli muovere?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Muoverli" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Annullare lo spostamento" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Rilasciare il pulsante del mouse per fermarsi. Ctrl per unire con il nodo " +"più vicino." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Spostare gli oggetti trascinandoli; Shift per aggiungere alla selezione " +"(Ctrl per togliere); Shift-Ctrl per ruotare i selezionati; oppure modificare " +"la selezione" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Ridimensiona e muovi la mappa" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Cambiare il livello di ingrandimento mediante trascinamento o premendo Ctrl" +"+. or Ctrl+,; muoversi con Ctrl+su,sinistra,giù,destra; muovere il livello " +"di ingrandimento con il tasto destro" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Cerca..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Cerca degli oggetti." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Inserire una stringa di ricerca." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "Sostituisci la selezione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "Aggiungi alla selezione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "Rimuovi dalla selezione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "Distingui maiuscole" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "espressione regolare" + +#: ../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." + +#: ../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: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, " +"type=, *=*, *=" +msgstr "" +"type=* - chiave 'type' contenente qualsiasi valore. Prova anche " +"*=value, type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Ricerche speciali:" + +#: ../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: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 +msgid "modified - all changed objects" +msgstr "modified - tutti gli oggetti modificati" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - tutti gli oggetti selezionati" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - tutti gli oggetti incompleti" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - tutti gli oggetti provi di proprietà" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" +"figlio espressione - tutti i figli degli oggetti " +"corrispondenti all'espressione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "" +"genitore espressione - tutti i genitori degli oggetti " +"corrispondenti all'espressione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "" +"Utilizzare | oppure OR per combinare secondo l''operatore " +"logico ''or''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Utilizzare \" per racchiudere gli operatori (es. se la chiave " +"contiene :)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Cerca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Inizia Ricerca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Nessuna corrispondenza trovata per ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Trovate {0} corrispondenze" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"L''espressione regolare \"{0}\" contiene un errore di interpretazione alla " +"posizione {1}, errore completo:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"La chiave non può essere vuota quando è utilizzato un operatore sulla " +"etichetta. Esempio di utilizzo: key=value" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Tipo di primitiva sconosciuta: {0}. I valori permessi sono: nodo, percorso o " +"relazione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Token inaspettato: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Argomenti mancanti per l'operatore booleano OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Argomento mancante per l'operatore booleano NOT." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Era attesa una parentesi chiusa." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Numero errato di parametri per operatore sui nodi." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Valore non corretto per l''operatore sui nodi: {0}. L'operatore sui nodi " +"richiede un numero o un intervallo di nodi, per esempio nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Valore non corretto per l''operatore id: {0}. E' atteso un numero." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Carica selezione" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Collegamento a {0} in corso..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, 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 +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}" +msgstr "Aggiungere {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Cambiare {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Rimuovi \"{0}\" per {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "oggetto" +msgstr[1] "oggetti" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Rimuovi \"{0}\" per {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Imposta {0}={1} per {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Cambiare il membro della relazione per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Risolvi conflitto" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Nessuna corrispondenza trovata per ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " +"disponibile" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Risolvi conflitti nelle coordinate in {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"La selezione \"{0}\" è usata dalla relazione \"{1}\".\n" +"Cancellare dalla relazione?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Dividi il segmento del percorso" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Stai per cancellare dei nodi fuori dall'area scaricata.
Questo potrebbe " +"causare dei problemi poiché i nodi potrebbero far parte di altri oggetti " +"(che non puoi vedere).
Vuoi veramente cancellarli?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Elimina dalla relazione" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Risolvi conflitti nello stato eliminato in {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Sposta" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nodo" +msgstr[1] "nodi" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Eliminazione di 1 primitiva" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "rimozione del riferimento dal percorso {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "rimozione del riferimento dalla relazione {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Ruota {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Sequenza" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Risolvi i conflitti di versione per {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "Il set di dati principale non include il node {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Applicare?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Invertendo la direzione di questo percorso si consiglia di apportare i " +"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la " +"consistenza dei dati." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relazione" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Vecchia regola" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nuova regola" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Chiave precedente" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Valore precedente" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nuova chiave" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nuovo valore" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Applica i cambiamenti selezionati" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Non applicare cambiamenti" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Proprietà di " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Regole nelle relazioni a cui si riferiscono" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Correzione automatica etichette" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Preferenze salvate in {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Impossibile scaricare le preferenze dal server." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2665,5 +2959,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2672,27 +2966,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Errore: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Attenzione: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "nodi" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2700,13 +2994,13 @@ msgstr[1] "percorsi" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "vie" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2714,22 +3008,22 @@ msgstr[1] "relazioni" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relazioni" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../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:10 +#: ../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:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2743,23 +3037,23 @@ msgstr[1] "{0} membri" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "strada" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "ferrovia" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "corso d'acqua" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "tipologia di area" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2814,5 +3108,5 @@ msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Il percorso dello stile dell''area non è chiuso." @@ -2950,9 +3244,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2969,5 +3258,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "sfondo" @@ -2978,8 +3267,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2995,5 +3284,5 @@ "e crea un nuovo layer sulla nuova zona." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Zona di Lambert (Francia)" @@ -3016,22 +3305,141 @@ msgstr "Zona UTM {0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Impossibile leggere i segnalibri." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Impossibile scrivere i segnalibri." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Non mostrare di nuovo" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " +"{0}.\n" +"Controllare l''indirizzo URL del server nelle proprie preferenze e la " +"propria connessione ad internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Upload failed verso il server poiché il dataset " +"usato
viola una precondizione.
Il messaggio di errore é:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Violazione della precondizione" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "sconosciuto" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Eccezione inattesa" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Impossibile connettersi al server osm. Controllare la propria connessione ad " +"internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"E'' fallito il tentativo di inizializzare la comunicazione con il server OSM " +"{0}.\n" +"Controllare l''indirizzo URL del server nelle proprie preferenze e la " +"propria connessione ad internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Host sconosciuto" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Upload fallito poiché una delle primitive che hai " +"cercato di cancellare
dal server era già stata eliminata.

Il " +"messaggio di errore è:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Il messaggio del giorno non è disponibile" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- la versione in esecuzione è {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Scaricamento del \"messaggio del giorno\"" @@ -3112,65 +3520,58 @@ msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Impossibile trovare la traduzione per la stringa locale {0}. Ripristinata a " -"{1}" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opzioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Mostra questo aiuto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Scarica la zona delimitata dal riquadro di selezione" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Scarica la zona indicata dall'URL (interpretando lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Apri il file (come gps grezzo se .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Seleziona i risultati della ricerca della stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Lancia in modalità massimizzata" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Reimposta le preferenze predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Imposta la lingua." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "Esempi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3180,25 +3581,25 @@ "quindi assicurati di caricare dei dati prima di indicare una selezione." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Invece di --download= puoi utilizzare osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Attivazione estensioni aggiornate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Caricamento vecchie estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Impostazioni predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Caricamento estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -3207,26 +3608,26 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Preimpostati" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3234,21 +3635,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Abilita/disabilita la visualizzazione a fil di ferro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Abilita/disabilita visualizzazione a schermo pieno" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3292,53 +3693,68 @@ msgstr "scala" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "La longitudine geografica del puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Il nome dell'oggetto sul puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "La latitudine geografica del puntatore del mouse." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "L'angolo tra il segmento di percorso corrente e quello precedente." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Direzione della bussola del segmento che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Lunghezza del segmento di percorso che si sta disegnando." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "livello non in lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "Il livello {0} deve essere presente nella lista dei livelli" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Connessione al server OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Impossibile interpretare" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3361,4 +3777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inizializzazione" @@ -3390,20 +3807,20 @@ msgstr "il ruolo {0} non partecipa nella comparazione {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Proprietà" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Etichette" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3411,30 +3828,30 @@ msgstr "Nodi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Etichette({0} conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} conflitti di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Nodi(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3443,17 +3860,17 @@ "alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Nodi(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Conflitti in attesa nella lista di nodi di questo percorso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Membri(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3463,25 +3880,25 @@ "non c'è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Membri(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitti in attesa nella lista di membri di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "Non c'è alcun conflitto di proprietà in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Proprietà(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Conflitti di proprietà in attesa di essere risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Risoluzione conflitto" @@ -3518,5 +3935,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Versione personale" @@ -3529,5 +3946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3543,5 +3960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "La loro versione" @@ -3630,7 +4047,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3708,14 +4124,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "il parametro '{0}' non deve essere nullo" @@ -3748,10 +4164,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "indice di colonna non atteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3762,19 +4178,19 @@ "server
Dettagli: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Comunicazione con il server fallita" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Si, ripristina anche questo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "No, annulla l'operazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3782,12 +4198,12 @@ "the server.

Do you want to undelete these nodes too?" msgstr "" -"Ci sono {0} nodi aggiuntivi usati dalla via {1}
che sono cancellati " -"sul server.

Vuoi recuperare anche questi nodi?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +"Ci sono {0} nodi aggiuntivi usati dalla via {1}
che sono stati " +"cancellati sul server.

Vuoi recuperare anche questi nodi?" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Ripristina i nodi addizionali?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3797,14 +4213,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Ripristina le primitive dipendenti?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Proprietà nell'insieme di dati personale, cioè l'insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3812,90 +4228,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Proprietà nel loro insieme di dati, cioè l'insieme di dati del server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Coordinate:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Stato eliminato:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Stato visibile:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(nessuno/a)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "cancellato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "non eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "non visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Mantieni un clone della versione locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Elimina fisicamente dall'insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Mantieni le mie coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Mantieni le loro coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Marca come irrisolto il conflitto tra coordinate differenti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Mantieni il mio stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Mantieni il loro stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Marca come irrisolto il conflitto tra stati eliminati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Mantieni il mio stato visibile" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Si, reimposta l'id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "No, annulla" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3908,5 +4324,5 @@ "assegnerà ad esso
un nuovo identificativo.
Si è d'accordo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Reimposta l'id a 0" @@ -3933,12 +4349,11 @@ msgstr "Elimina dall'insieme di dati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3987,10 +4402,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3999,10 +4414,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4011,5 +4426,5 @@ msgstr "Valore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione" @@ -4072,9 +4487,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4082,5 +4497,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4112,41 +4527,45 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Risolvi conflitti" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Annulla la risoluzione del conflitto e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Applica risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Applica risoluzioni parziali" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Continua comunque" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Continua risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"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 "" "Non si è finito di risolvere tutti i conflitti.
Cliccare {0}" @@ -4155,4 +4574,17 @@ "strong> per ritornare alla risoluzione dei conflitti." +#: ../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 "Risolvi conflitti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Risolvi i conflitti di versione per {0} {1}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 @@ -4171,96 +4603,130 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, 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:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Elemento dello storico" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Visualizza lo storico della primitiva selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Livelli" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Cancella il livello selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Ci sono modifiche non salvate. Cancellare comunque il layer?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Elimina livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Vuoi veramente cancellare tutto il livello?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informazioni" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "si" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Cancella" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Cancella {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Mostra/Nascondi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Inverte la visibilità del livello selezionato." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Mostra/Nascondi testo/icone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Invertire la visualizzazione dei marcatori di testo ed icone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Livelli" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privato" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Cancella il livello selezionato." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Unisci il layer direttamente nel layer selezionato sotto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Sposta il livello selezionato in su." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Sposta il layer selezionato in giù." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Unisci il layer direttamente nel layer selezionato sotto" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Livelli: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Tabellone informativo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4269,22 +4735,28 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Un valore vuoto cancella la chiave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Cambiare i valori?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4293,84 +4765,89 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Seleziona una chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Seleziona un valore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Proprietà/Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Proprietà per gli oggetti selezionati." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Cambia relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Aggiungi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Modifica proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Elimina proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Cancella la chiave selezionata in tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Proprietà: {0} / Appartenenze: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Proprietà / Appartenenze" @@ -4379,63 +4856,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Apri tutte le relazioni in una lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relazioni: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Cancella le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Crea una nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relazioni: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Cancella le relazioni selezionate" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Apri una finestra con la lista delle selezioni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Fai lo zoom sugli elementi selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Ricarica la lista di selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoom sulla selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4444,5 +4923,5 @@ msgstr[1] "{0} percorsi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4451,5 +4930,5 @@ msgstr[1] "{0} relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4460,5 +4939,10 @@ msgstr "Stacca il pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4467,15 +4951,15 @@ "degli strumenti a sinistra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autori" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" @@ -4483,130 +4967,399 @@ "selezionati." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "N. di oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autori: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Scarica i membri della relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Area da scaricare" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Cancella le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Scarica i tasselli visibili" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Conflitto nei dati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Nessuna relazione selezionata" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Scaricamento estensione {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relazioni" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Sono stati rimossi elementi dalle Relazioni" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "E' fallito il tentativo di aggiornare le primitive selezionate." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Sposta in alto i membri attualmente selezionati" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Sposta in basso i membri attualmente selezionati" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Rimuovi dalla relazione gli elementi selezionati" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Cancella le relazioni selezionate" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Continua risoluzione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Conflitto nei dati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Salva i dati attuali." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Scarica i membri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Si, elimina" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Conferma l'azione del controllo remoto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Riduci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Sposta in basso i membri attualmente selezionati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Applica cambiamenti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Di base" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Occupato da" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "collegato" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Sposta in alto" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Sposta in alto i membri attualmente selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Aggiungi la selezione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Aggiungi tutti gli oggetti selezionati come membri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Elimina gli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Rimuovi dalla relazione gli elementi selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Ordina" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Ordina i membri della relazione selezionata o l'intera lista" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Sposta in basso" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Sposta in basso i membri attualmente selezionati" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "" -"Cancella il membro dalla riga della tabella utilizzata da questa relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Scarica i membri" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "Membri: {0} (collegato: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor relazione: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Ci sono stati {0} conflitti durante l'importazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Crea una nuova relazione nel layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Modifica la nuova relazione nel layer ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Modifica la relazione #{0} nel layer ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Carica selezione" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4616,5 +5369,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4624,25 +5377,22 @@ msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Aggiorna le proprietà di {0} oggetto" -msgstr[1] "Aggiorna le proprietà di {0} oggetti" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Segnalibri" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Per prima cosa inserisci le coordinate della località." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Inserisci il nome della località." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Cambia posizione" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Per prima cosa, scegli un segnalibro." @@ -4677,17 +5427,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Sorgenti di dati e tipi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Scarica come nuovo layer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Area da scaricare" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4695,18 +5445,18 @@ "dal server" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Area da scaricare corretta, sarà probabilmente accettata dal server" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Inserire la stringa da cercare" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Impossibile leggere dal server i risultati della ricerca del luogo" @@ -4714,5 +5464,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Inserire il nome di un luogo da cercare:" @@ -4720,5 +5470,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4726,6 +5476,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nome" @@ -4764,6 +5514,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4786,15 +5536,15 @@ msgstr "tipo" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "vicino a" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "livello di ingrandimento" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4803,5 +5553,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Slippy map" @@ -4833,5 +5583,11 @@ msgstr "Storico per {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Chiudi la finestra" @@ -5575,5 +6331,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5742,59 +6498,59 @@ msgstr "Versione" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Immagini per {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Leggi GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Non è stata trovata nessuna immagine con una data leggibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lettura di {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Immagini geoetichettate" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS inizio: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS fine: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "differenza attuale: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "differenza fuso orario: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5802,138 +6558,128 @@ msgstr[1] "immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} in questa traccia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sincronizza tempo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Immagini JPEG (*.jpeg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Impossibile leggere la data nel file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Orario non presente nei dati EXIF del file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Immagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Fuso orario del GPS (differenza rispetto alle foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizza l'orario con l'unità GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Impossibile decodificare l'orario inserito." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punto GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personalizza disegno linee" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Usa le impostazioni globali." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Disegna le linee tra i punti di questo livello." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Non disegnare le linee tra i punti di questo livello." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Seleziona le opzioni per il disegno delle linee" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personalizza colori" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Predefinito" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Scegli un colore" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Crea marcatori dai punti con nome" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Nomina i punti del percorso da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importa l'audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Files audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Marcatori audio da {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importa immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5942,5 +6688,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5949,5 +6695,5 @@ msgstr[1] "{0} percorsi, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5956,30 +6702,30 @@ msgstr[1] "{0} punti del percorso" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nome: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Descrizione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Timespan/Arco di tempo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lunghezza: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Converti in livello dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5989,43 +6735,43 @@ "considerato dannoso.
Se si desidera caricare delle tracce, vedere qui:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Convertito da: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Scarica tutto entro:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km quadrati" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -6036,9 +6782,9 @@ "vuole procedere?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Nessuna traccia GPX da associare con l'audio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6049,5 +6795,5 @@ "all'inizio." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6057,19 +6803,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "al di fuori dell'area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -6077,29 +6823,29 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} eliminati)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6124,5 +6870,5 @@ msgstr[1] "tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6130,5 +6876,5 @@ msgstr[1] "punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6137,5 +6883,5 @@ msgstr[1] "una traccia con {0} punti" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6144,5 +6890,5 @@ msgstr[1] "{0} è composto da {1} tracce" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6161,5 +6907,5 @@ msgstr[1] "marcatori" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6168,29 +6914,29 @@ msgstr[1] "{0} è composto da {1} marcatori" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sincronizza l'audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Premi pausa quando senti il segnale di sincronizzazione." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Audio sincronizzato al punto {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Impossibile sincronizzare nel layer in esecuzione." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Esegui il marcatore audio all'inizio del brano" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6198,10 +6944,17 @@ msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Non ci sono marcatori audio in questo layer da compensare." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Mostra/Nascondi testo/icone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Invertire la visualizzazione dei marcatori di testo ed icone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6212,5 +6965,5 @@ "(dopo il primo marcatore)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6220,29 +6973,29 @@ "tracciato da sincronizzare." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Impossibile creare un nuovo segnaposto Audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Impossibile mostrare l'URL per questo marcatore" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Impossibile visualizzare l'URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Preferenze avanzate" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Impostazione diretta delle preferenze. Usare con cautela!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6250,27 +7003,27 @@ msgstr "Cerca: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Il valore corrente è quello di default." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Il valore di default è ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "Il valore di default è sconosciuto (l'impostazione non è stata ancora usata)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Scegli la riga da modificare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6278,14 +7031,14 @@ msgstr "Nuovo valore per {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Scegli la riga da cancellare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Inserisci una nuova coppia chiave/valore" @@ -6431,40 +7184,40 @@ msgstr "Calibrazione del registratore vocale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Colore" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Stile di disegno {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Livello: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Scegliere" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Scegliere un colore per {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Reimposta predefinito" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Reimposta tutto predefinito" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Colori usati da diversi oggetti in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Colori" @@ -6816,46 +7569,55 @@ msgstr "Stile usato" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Configura le estensioni disponibili." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Scarica la lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Aggiorna" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Configura i siti..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Seleziona una voce." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Modifica indirizzo URL di descrizione dell'estensione JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Configura i siti delle estensioni" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Impostazioni di visualizzazione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6865,30 +7627,30 @@ "programma." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Impostazioni di connessione" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Impostazioni di connessione al server OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Impostazioni della mappa" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "" "Impostazioni per la proiezione della mappa e l'interpretazione dei dati." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Impostazione dell'audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Impostazioni del riproduttore audio e del marcatore audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6968,4 +7730,7 @@ "URL.
Do not use a valuable Password." msgstr "" +"AVVISO: La password viene memorizzata in chiaro nel file di " +"configurazione.
La password viene trasmessa in chiaro al server, encodata " +"all'interno dell'URL.
Non usare una password di valore." #. 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 @@ -6992,45 +7757,47 @@ msgstr "Scorciatoia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "Breve descrizione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "Indirizzo URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "Autore: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Pagina internet: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "Versione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Percorso Icone" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "Copia predefiniti" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Selezionare la riga da copiare." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." @@ -7039,14 +7806,14 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "Aggiungi una nuova sorgente XML alla lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Elimina la sorgente selezionata nella lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)" @@ -7240,33 +8007,33 @@ msgstr "Gruppi dei modificatori" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Ulteriori informazioni su questa caratteristica" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Attributi opzionali:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Usa la preimpostazione ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "percorso chiuso" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7277,15 +8044,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Sono supportati elementi di tipo {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7295,18 +8062,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -7317,33 +8084,36 @@ msgstr "Gruppo di preimpostazioni \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Collegamento al server OSM in corso..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Scaricamento dei punti da {0} a {1} in corso..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Scaricamento dei dati OSM in corso..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, è possibile che manchino delle etichette." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Preparazione dei dati in corso..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Impossibile leggere \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7351,21 +8121,21 @@ msgstr "Files GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Marcatori da {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "il file \"{0}\" non esiste" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7382,5 +8152,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -7388,5 +8172,10 @@ "Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7396,48 +8185,47 @@ "singola primitiva" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Files NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Coordinate importate: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Formato non corretto: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Errori di checksum: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Frase sconosciuta " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Coordinate iniziali " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA importato con successo" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Importazione NMEA non riuscita!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7448,5 +8236,5 @@ "supportare le versione da {0} a {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" @@ -7455,10 +8243,10 @@ "protocollo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7466,35 +8254,48 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Apertura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Invio in corso..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Analisi cartella {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Code={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Il server ha restituito un errore con codice {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7527,9 +8328,4 @@ msgstr "Login" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Interruzione in corso" - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7548,4 +8344,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo long, ricevuto " +"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77 @@ -7554,4 +8352,6 @@ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo long (>=0), " +"ricevuto ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91 @@ -7559,4 +8359,6 @@ msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto " +"''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94 @@ -7565,4 +8367,6 @@ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), " +"ricevuto ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114 @@ -7571,4 +8375,6 @@ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, " +"ricevuto ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174 @@ -7578,4 +8384,10 @@ "''{1}''" msgstr "" +"valore non valido per attributo obbligatorio ''{0}'' di tipo " +"OsmPrimitiveType, ricevuto ''{1}''" + +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 @@ -7583,39 +8395,39 @@ msgstr "Errore nella scansione." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Server dei File di OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Versione sconosciuta" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "I dati OSM sono privi del numero di versione" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Versione sconosciuta: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Trovato elemento in non-percorso." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " ha zero ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Trovato etichetta su una non relazione." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" @@ -7624,10 +8436,10 @@ "ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Manca l''attributo \"type\" sul membro {0} della relazione {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." @@ -7635,13 +8447,13 @@ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr " incompleto, specificazione con ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Oggetto illegale con id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7651,47 +8463,66 @@ "{0}, ottenuto {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Missing attribute \"version\" on OSM primitive with id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Attributo richiesto mancante \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Preparazione dati OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Id del nodo malformato" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Scaricamento dello storico..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Connessione al server in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "E' fallita l'apertura della connessione alle API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7700,5 +8531,18 @@ "internet." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7707,16 +8551,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} rimanenti. Caricamento di {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Aggiorna estensioni" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Scarica Estensioni" @@ -7733,5 +8572,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7741,23 +8580,23 @@ "Le estensioni {0} sono state scaricate con successo. Riavviare JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Scaricamento estensione {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Salta il download" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Scarica estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Salta scaricamento" @@ -7768,29 +8607,27 @@ msgstr "E' stato generato un errore dall'estensione {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Attenzione - era richiesto il caricamento del plugin {0}. Questo plugin non " "è più necessario." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Il plugin {0} è richiesto dal plugin {1} ma non è stato trovato" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Estensione non trovata: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." @@ -7799,5 +8636,5 @@ "giorni fa." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7808,21 +8645,21 @@ "warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Disabilita estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Mantieni estensione" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7832,5 +8669,5 @@ "i permessi per sovrascrivere quelle esistenti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7840,10 +8677,10 @@ "dall'estensione ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Secondo le informazioni all'interno del plugin l'autore è {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7852,9 +8689,9 @@ "comunicare un bug." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Disabilitare l'estensione?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7864,27 +8701,23 @@ "eliminare l'estensione." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Impossibile rimuovere l'estensione. Riportate il problema alle persone da " -"cui si è ottenuto JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informazioni" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Non è stata trovata alcuna informazione sulle estensioni." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "nessuna descrizione disponibile" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Maggiori dettagli" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7893,13 +8726,18 @@ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Non è stata trovata alcuna informazione sulle estensioni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Tutte le estensioni sono state aggiornate." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7912,9 +8750,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Scarica le estensioni mancanti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7927,57 +8765,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "sconosciuto" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versione {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Estensioni fornite con JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Impossibile leggere il file con le informazioni sulle estensioni: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Questo si trova dopo la fine della registrazione" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Impossibile riprodurre il suono" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Non fare niente" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Segnala bug" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7992,14 +8808,14 @@ "inoltrare un bug report." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Eccezione inattesa" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Si prega di segnalare il problema a {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -8007,5 +8823,5 @@ "possibile)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -8015,17 +8831,35 @@ "di segnalare un problema." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Assicurarsi di includere le seguenti informazioni:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Il testo è stato già copiato nei tuoi appunti)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Non mostrare di nuovo" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"Impossibile trovare la traduzione per la stringa locale {0}. Ripristinata a " +"{1}" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -8039,5 +8873,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -8047,5 +8881,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -8056,13 +8890,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Crea una griglia di percorsi" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8072,21 +8921,21 @@ "composti da più nodi ed aventi un nodo in comune" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Seleziona due percorsi con un nodo in comune" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Seleziona due percorsi con solo un nodo in comune" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Crea una griglia di percorsi" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Carica tracciato" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8094,9 +8943,9 @@ msgstr "Carica tracciati" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Pubblico" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" @@ -8104,65 +8953,66 @@ #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Descrizione" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Inserire la descrizione sul proprio tracciato." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Inserire le etichette sul proprio tracciato." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Tracciato selezionato: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Connessione in corso..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Caricamento annullato" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Errore durante il caricamento" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Caricamento GPX completato con successo" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Caricamento fallito. Il server ha risposto con il seguente messaggio: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Caricamento tracciato GPX in corso: {0}% ({1} di {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Non è stata fornita alcuna descrizione. Specificarne una." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nessun livello GPX selezionato. Impossibile caricare un tracciato." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Non è stato fornito alcun nome utente." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Non è stata fornita alcuna password." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Caricamento del tracciato GPX in corso" @@ -8232,33 +9082,34 @@ msgstr "Uno dei file selezionati è nullo !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Lettura delle foto ..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Analisi cartella {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Trovato un file nullo nella cartella {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Correlazione ai dati GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8278,15 +9129,15 @@ msgstr "File GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Impossibile interpretare {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8297,34 +9148,34 @@ "la foto.
Copia l'ora dalla foto e seleziona la fascia oraria
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Ora di scatto della fotografia (dai dati exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Ora GPS (letto dalla fotografia precedente): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [gg/mm/aaaa hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Mi trovo nel fuso orario di: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Nessuna data" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Apri un'altra fotografia" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8334,29 +9185,29 @@ "Si prega di usare il formato richiesto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Data non valida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Tracciato GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Apri un altro tracciato GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Fuso orario: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Scostamento:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8364,41 +9215,41 @@ "di aiuto?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Aggiorna la posizione per: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Tutte le immagini" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Immagini senza posizione exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Immagini ancora senza etichetta" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Correla le immagini al tracciato GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Correla" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Auto-determina" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Selezionare un tracciato GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Nessun tracciato GPX selezionato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8409,9 +9260,9 @@ "Formato atteso: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Fuso orario non valido" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8422,26 +9273,26 @@ "Formato atteso: {0}." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Compensazione non valida" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Tracciato GPS caricato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Le foto selezionate non contengono informazioni sull'ora." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Le foto non contengono informazioni sull'ora" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8450,39 +9301,39 @@ "Selezionarne un altro." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Fuso orario: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minuti: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Secondi: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Correlate {0} su {1} foto al tracciato GPX." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Differenza di orario pari a {0} giorni)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Differenza tra il tracciato e le foto: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8493,13 +9344,13 @@ "manualmente le foto." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 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:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Regola fuso orario e differenza" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Valori predefiniti" @@ -8521,5 +9372,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Errore durante il caricamento del file" @@ -8542,6 +9393,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: indirizzo url non valido." @@ -8730,22 +9581,22 @@ msgstr "Aggiungere \"source=...\" agli elementi?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Scaricamento di {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Collegamento al Server WMS in corso..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Crea un edificio" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8755,18 +9606,18 @@ "la dimensione massima di importazione dell'edificio è di 1 km2." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Abilitare la sorgente automatica e controllare l'annata del catasto." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Estrai il riquadro di visualizzazione SVG..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Estrai il riquadro più appropriato..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Creazione confine" @@ -8884,6 +9735,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Livello vuoto" @@ -8912,5 +9763,5 @@ msgstr "Riquadro del comune: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8921,9 +9772,9 @@ "Crearne uno nuovo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Errore nel formato della cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -8932,5 +9783,5 @@ "corrente" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Errore nella zona di Lambert della cache" @@ -9021,4 +9872,9 @@ msgstr "Impossibile duplicare un percorso senza direzione." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Nessun dato caricato." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -9029,9 +9885,9 @@ msgstr "Crea un percorso duplicato" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Livello per la modifica dei tracciati GPX" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Converti in livello GPX con orario anonimo" @@ -9152,30 +10008,30 @@ msgstr "elimina i dati dopo l'importazione" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importazione dei dati dal dispositivo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importazione dati da DG100 in corso..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Errore nell'eliminazione dei dati." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "dati importati da {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Nessun dato trovato sul dispositivo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Connessione non riuscita." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9187,14 +10043,14 @@ "mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Importazione Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Importa dati da Globalsat Datalogger DG100 in un livello GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importa" @@ -9285,40 +10141,40 @@ msgstr "Apri immagini con ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Indice di direzione '{0}' non trovato" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "La posizione iniziale non è all'interno del riquadro di selezione" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Ricerca della riva..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} nodi mancanti..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lago Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Errore nella creazione della cartella di cache: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Tracciato" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "verifica della cache in corso..." @@ -9327,26 +10183,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Riduzione dei vertici in corso..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Approssimazione Douglas-Peucker in corso..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Rimozione dei nodi duplicati in corso..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Traccia Lakewalker" @@ -9431,7 +10279,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "acqua" @@ -9591,9 +10439,9 @@ msgstr "Preferenze dell'estensione Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Scaricamento immagine tassello in corso..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Impossibile acquisire l'immagine" @@ -9849,18 +10697,18 @@ msgstr "Stato della segnalazione sconosciuto" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Apri file visibili..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Apre solo i file che sono visibili nella visualizzazione corrente." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Nessuna visualizzazione aperta - impossibile determinare i confini!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9887,21 +10735,21 @@ msgstr "Eseguibile di Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "carica dati dalle API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "cambia la selezione" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "cambia la visualizzazione" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "conferma manualmente tutte le azioni di controllo remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" @@ -9909,13 +10757,13 @@ "applicazioni." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Controllo remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Preferenze per l'estensione di controllo remoto." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9927,28 +10775,28 @@ "applicazioni esterne che devono dialogare con l'estensione." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Azioni permesse" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Dettagli della richiesta: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Si vuole permettere questo?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Conferma l'azione del controllo remoto" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9959,13 +10807,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Modifica la relazione" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Modifica le relazioni" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Nessuna relazione selezionata" #. Add menu @@ -10079,5 +10927,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "immagine " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10124,5 +10972,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -10215,4 +11063,25 @@ msgid "Highlight" msgstr "In evidenza" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Aggiorna le proprietà di {0} oggetto" +msgstr[1] "Aggiorna le proprietà di {0} oggetti" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10476,29 +11345,29 @@ "specifico." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Inserire Lat/Lon a cui andare." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Puoi anche incollare un URL da www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (in metri)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "Indirizzo URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Salta lì" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Salta alla posizione" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -10506,5 +11375,5 @@ "Verifica." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Impossibile interpretare longitudine/latitudine" @@ -10538,6 +11407,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Errori di verifica" @@ -10547,10 +11416,10 @@ msgstr "Nessun errore individuato" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Griglia" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10644,23 +11513,15 @@ msgstr "Esegue la convalida dei dati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "I dati contengono errori. Caricarli ugualmente?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Apre la finestra di verifica." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Porta lo zoom sul problema" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Convalida" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10733,22 +11594,22 @@ msgstr "Percorsi incrociati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Nodi duplicati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Questo test verifica che non ci siano due nodi nella stessa posizione." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Nodi dei percorsi duplicati." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Cerca i percorsi con nodi consecutivi identici." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Nodi dei percorsi duplicati." @@ -10829,9 +11690,9 @@ "errori d'ortografia." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Analizzatore delle proprietà :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" @@ -10839,15 +11700,15 @@ "proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Linea TagChecker non valida - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Linea di correzione ortografica non valida: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10858,7 +11719,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Combinazione illegale etichetta/valore" @@ -10866,60 +11727,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problema di disegno" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Chiave ''{0}'' non valida." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Tag con valori vuoti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "chiave della proprietà non valida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "spazio non valido nella chiave della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Il valore della proprietà inizia o finisce con uno spazio" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Il valore della proprietà contiene una entità HTML" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Chiave ''{0}'' non presente nei preimpostati." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "I preimpostati non contengono la chiave della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Valore ''{0}'' per la chiave ''{1}'' non presente nei preimpostati." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "I preimpostati non contengono il valore della proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXME" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Verifica le chiavi delle proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -10927,20 +11788,22 @@ "valide." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Usa un analizzatore delle proprietà complesso." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" "Valida i valori delle proprietà e delle etichette usando regole complesse." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Sorgente TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10951,21 +11814,21 @@ "delle etichette." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Aggiungi una nuova sorgente alla lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Modifica la sorgente selezionata." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Sorgenti dei dati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Verifica i valori delle proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -10973,9 +11836,9 @@ "validi." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Cerca FIXME." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" @@ -10983,54 +11846,54 @@ "proprietà." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Controllare le note di disegno." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Controllare se il disegno della mappa contiene degli errori." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Usa file dati predefinito." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Usa il file dati predefinito (consigliato)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Usa file di controllo ortografico predefinito." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Usa il file di controllo ortografico predefinito (consigliato)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Correggi proprietà" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Impossibile trovare il tipo di elemento" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Impossibile trovare il livello di avvertimento" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Espressione illegale \"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11175,7 +12038,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "building" @@ -11189,5 +12052,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "area" @@ -11221,10 +12084,10 @@ msgstr "Nodo finale della strada collegata vicino ad un'altra strada" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Nodi senza etichetta e non connessi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11248,5 +12111,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Incrocio senza nome" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -11284,8 +12147,32 @@ msgstr "Terraferma invertita: manca la terraferma sul lato sinistro" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11296,10 +12183,10 @@ msgstr "Selezionare un nodo iniziale alla fine di un percorso" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "E' stata raggiunta la fine della linea" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "E' stato raggiunto un incrocio" @@ -11371,14 +12258,14 @@ msgstr "Aiuto sull'estensione WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Immagine rettificata..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Scarica immagini rettificate da vari servizi" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11389,26 +12276,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Collegamento WMS personalizzato" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Servizi di rettifica supportati:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Visita la homepage" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "Indirizzo URL WMS o ID dell'immagine:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Aggiungi immagine rettificata" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11418,5 +12305,5 @@ "l'identificativo al servizio selezionato. Si prega di riprovare." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Nessun id o indirizzo URL WMS valido" @@ -11426,5 +12313,5 @@ msgstr "Correggere la posizione del layer WMS selezionato" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11435,9 +12322,9 @@ "Potrebbero essere presenti errori nelle coordinate." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Scaricamento automatico" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" @@ -11445,10 +12332,10 @@ "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11457,88 +12344,88 @@ "oppure cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Ricarica tile sbagliati" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Apri un livello WMS vuoto per caricare i dati da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Preferenze dell'estensione WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nome del Menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Nome del menu (predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "URL WMS (Predefinito)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 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:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Copia predefinito" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Downloader:" @@ -11667,11 +12554,16 @@ "dg100." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11685,10 +12577,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Aiuta nella vettorizzazione delle immagini WMS." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11698,5 +12590,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11710,5 +12602,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11722,15 +12614,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Visualizza una immagine di sfondo OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importa le segnalazioni da OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11740,5 +12632,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11748,5 +12640,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11757,27 +12649,30 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Il grande aspetto e stile JGoodies Plastic." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " "defined in routes.xml file in plugin directory" msgstr "" +"Renderizza i percorsi (bus, scalata, bicicletta, etc...). I tipi di percorso " +"devono essere definiti all'interno del file routes.xml nella directory dei " +"plugin" #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Fornisce funzioni di navigazione" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11788,15 +12683,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11810,10 +12705,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11825,5 +12720,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11834,5 +12729,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11843,6 +12738,13 @@ "Correttore ortografico integrato per i nomi delle etichette." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -11850,5 +12752,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -13005,58 +13907,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -13070,6 +13920,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorway" @@ -13095,6 +13945,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "trunk" @@ -13120,6 +13970,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "primary" @@ -13145,6 +13995,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "secondary" @@ -13158,5 +14008,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "tertiary" @@ -13174,5 +14024,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "residential" @@ -13206,6 +14056,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "service" @@ -13232,6 +14082,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "construction" @@ -13281,5 +14131,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rotatoria" @@ -14258,5 +15108,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "palude alluvionale" @@ -15987,27 +16837,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18847,7 +19697,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bicicletta" @@ -18917,7 +19767,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "pedone" @@ -18943,5 +19793,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metropolitana" @@ -19432,13 +20282,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "deprecato" @@ -19480,5 +20330,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "cavallo" @@ -19698,4 +20548,66 @@ msgstr "barriera" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Superstrada" + #. color tertiary #. @@ -19730,6 +20642,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "strada" @@ -19785,7 +20697,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "tracciato_stradale" @@ -19841,8 +20753,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "ferrovia" @@ -19863,5 +20775,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "servizi" @@ -19875,5 +20787,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "guado" @@ -19894,5 +20806,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "slargo per inversione di marcia" @@ -19907,5 +20819,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "punto di accesso di emergenza" @@ -19920,5 +20832,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "sponda" @@ -19932,5 +20844,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "torrente" @@ -19944,5 +20856,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "darsena" @@ -19970,5 +20882,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "acquedotto" @@ -20136,13 +21048,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "costruzioni umane" @@ -20204,7 +21116,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "punto ferroviario" @@ -20227,10 +21139,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "altro_ferrovia" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "ferrovia (sopra)" @@ -20266,7 +21178,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "vecchia_ferrovia" @@ -20311,6 +21223,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "aeroporto" @@ -20324,5 +21236,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20344,5 +21256,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "aeroporto (scuro)" @@ -20356,5 +21268,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "aeroporto (chiaro)" @@ -20402,7 +21314,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "struttura_di_risalita" @@ -20419,5 +21331,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "pista_facile" @@ -20432,5 +21344,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "pista_intermedia" @@ -20445,5 +21357,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "pista_avanzata" @@ -20458,5 +21370,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "pista esperto" @@ -20471,5 +21383,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "pista_libera" @@ -20484,5 +21396,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "pista_principiante" @@ -20587,10 +21499,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "elettricità" @@ -20604,5 +21516,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "pontile" @@ -20616,5 +21528,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "conduttura" @@ -20742,12 +21654,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "struttura per lo svago" @@ -20761,5 +21673,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "porto turistico" @@ -20831,8 +21743,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "struttura di servizio" @@ -20934,10 +21846,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "servizio al traffico" @@ -21323,22 +22235,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "struttura di servizio (chiaro)" @@ -21370,6 +22282,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "acqua (chiaro)" @@ -21430,8 +22342,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "salute" @@ -21784,26 +22696,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "negozio" @@ -21875,8 +22787,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -22026,9 +22938,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turismo" @@ -22100,8 +23012,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "attrazione storica" @@ -22172,8 +23084,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "verde" @@ -22187,5 +23099,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "cava/miniera" @@ -22199,5 +23111,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "discarica" @@ -22219,5 +23131,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "bacino" @@ -22231,5 +23143,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "foresta" @@ -22243,5 +23155,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "aia" @@ -22264,5 +23176,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "area commerciale (negozi)" @@ -22276,5 +23188,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industriale" @@ -22288,5 +23200,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "ridestinazione d'uso" @@ -22300,5 +23212,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "area agricola destinata alla costruzione" @@ -22312,5 +23224,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "area ferroviaria" @@ -22367,7 +23279,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "militare" @@ -22381,5 +23293,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cimitero" @@ -22392,5 +23304,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "picco montuoso" @@ -22405,5 +23317,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ghiacciaio" @@ -22417,5 +23329,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulcano" @@ -22470,8 +23382,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "elemento naturale" @@ -22485,5 +23397,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "boscaglia" @@ -22497,5 +23409,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "brughiera" @@ -22509,5 +23421,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "bosco" @@ -22521,5 +23433,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "zona fangosa (sabbie mobili)" @@ -22533,5 +23445,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "spiaggia" @@ -22609,8 +23521,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "percorso" @@ -22658,7 +23570,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "confine" @@ -22800,10 +23712,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "luogo" @@ -22851,6 +23763,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "indirizzo" @@ -23147,24 +24059,81 @@ msgstr "Terraserver Urban" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi." + +#~ msgid "API initialization failed" +#~ msgstr "Inizializzazione delle API fallita" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o " +#~ "scaricato un livello dati?" + +#~ msgid "No data" +#~ msgstr "Nessun dato" + +#~ msgid "Update failed" +#~ msgstr "Aggiornamento fallito" + +#~ msgid "Missing primitive" +#~ msgstr "Primitiva mancante" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Applica risoluzioni parziali" + +#~ msgid "Layers: {0}" +#~ msgstr "Livelli: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "" +#~ "Cancella il membro dalla riga della tabella utilizzata da questa relazione" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da " +#~ "cui si è ottenuto JOSM." + +#~ msgid "Validate" +#~ msgstr "Convalida" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." + +#~ msgid "Not implemented yet." +#~ msgstr "Non ancora implementato." + #~ msgid "Data Layer" #~ msgstr "Livello dati" -#~ msgid "Uploading data" -#~ msgstr "Caricamento dei dati" - -#~ msgid "Not implemented yet." -#~ msgstr "Non ancora implementato." - #~ msgid "Email" #~ msgstr "Email" -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolvi conflitti" - -#~ msgid "There were conflicts during import." -#~ msgstr "Si sono verificati dei conflitti durante l'importazione." - -#~ msgid "Object" -#~ msgstr "Oggetto" +#~ msgid "unnamed" +#~ msgstr "Senza nome" + +#~ msgid "Change" +#~ msgstr "Cambia" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Risolvere {0} conflitti in {1} oggetti" + +#~ msgid "Rotate" +#~ msgstr "Ruota" + +#~ msgid "different" +#~ msgstr "diverso" + +#~ msgid "true" +#~ msgstr "vero" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "position" +#~ msgstr "posizione" #~ msgid "{0} object has conflicts:" @@ -23182,36 +24151,12 @@ #~ msgstr "versione risolta:" -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nome utente (email) per l'account di OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Username OSM (email)" - -#~ msgid "Unknown host" -#~ msgstr "Host sconosciuto" - -#~ msgid "position" -#~ msgstr "posizione" - -#~ msgid "different" -#~ msgstr "diverso" - -#~ msgid "true" -#~ msgstr "vero" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Risolvere {0} conflitti in {1} oggetti" - -#~ msgid "Change" -#~ msgstr "Cambia" +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolvi conflitti" #~ msgid "Click Reload to refresh list" #~ msgstr "Fare clic su Ricarica per aggiornare la lista" -#~ msgid "Revert" -#~ msgstr "Ripristina" +#~ msgid "Object" +#~ msgstr "Oggetto" #~ msgid "Date" @@ -23225,9 +24170,15 @@ #~ "versione selezionata nella lista della cronologia." -#~ msgid "Rotate" -#~ msgstr "Ruota" +#~ msgid "Occupied By" +#~ msgstr "Occupato da" #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Etichette (un valore vuoto cancella l'etichetta)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri" + +#~ msgid "There were conflicts during import." +#~ msgstr "Si sono verificati dei conflitti durante l'importazione." #~ msgid "Error parsing server response." @@ -23242,16 +24193,30 @@ #~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." +#~ msgid "Contacting the OSM server..." +#~ msgstr "Connessione al server OSM..." + #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." -#~ msgid "Tagging preset source" -#~ msgstr "Sorgente preimpostazioni etichette" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "" -#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista." - -#~ msgid "Tagging preset sources" -#~ msgstr "Sorgenti preimpostazioni etichette" +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nome utente (email) per l'account di OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Username OSM (email)" + +#~ msgid "Aborting..." +#~ msgstr "Interruzione in corso" + +#~ msgid "Commit comment" +#~ msgstr "Inserisci commento" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" + +#~ msgid "Navigation" +#~ msgstr "Navigazione" + +#~ msgid "Revert" +#~ msgstr "Ripristina" #~ msgid "" @@ -23262,17 +24227,24 @@ #~ "aspetta prima di riprovare." -#~ msgid "Commit comment" -#~ msgstr "Inserisci commento" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Estensione aggiornata con successo. Riavviare JOSM." -#~ msgstr[1] "{0} Estensioni aggiornate con successo. Riavviare JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigazione" +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Aggiusta la posizione dl layer WMS" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (correzione GNOME)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id dell'immagine Metacarta Map Rectifier" + +#~ msgid "Charge" +#~ msgstr "Costo" #~ msgid "image not loaded" @@ -23286,63 +24258,52 @@ #~ "il mouse tenendo premuto il tasto destro. Selezionare: click." -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Id dell'immagine Metacarta Map Rectifier" - #~ msgid "rectifier id={0}" #~ msgstr "identificativo rectifier={0}" -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Aggiusta la posizione dl layer WMS" - -#~ msgid "Charge" -#~ msgstr "Costo" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (correzione GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" +#~ msgid "Tagging preset sources" +#~ msgstr "Sorgenti preimpostazioni etichette" + +#~ msgid "Tagging preset source" +#~ msgstr "Sorgente preimpostazioni etichette" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "" +#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista." + +#~ msgid "Add Selected" +#~ msgstr "Aggiungi la selezione" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Errore nell'eliminazione del file dell'estensione: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Estensione già esistente" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Drawbridge" +#~ msgstr "Ponte levatoio" #~ msgid "Server does not support changesets" #~ msgstr "Il server non supporta i changeset (API < 0.6)" -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Estensione già esistente" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Errore nell'eliminazione del file dell'estensione: {0}" - #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Alcuni nodi sono (quasi) in linea" -#~ msgid "Drawbridge" -#~ msgstr "Ponte levatoio" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Geofabrik.de dell'Alto Palatinato" - #~ msgid "Really mark this issue as ''done''?" #~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?" +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importa file TCX come tracciato GPS" + #~ msgid "Import TCX File..." #~ msgstr "Importa file TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importa file TCX come tracciato GPS" #~ msgid "" @@ -23438,4 +24399,117 @@ #~ "Non caricarire nessun dato dopo questo messaggio." +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Geofabrik.de dell'Alto Palatinato" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Conflitti: {0}" + +#~ msgid "viaduct" +#~ msgstr "viadotto" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "" +#~ "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: " +#~ "{0}\n" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert " +#~ "corrente {1}" + +#~ msgid "Remove Selected" +#~ msgstr "Elimina gli elementi selezionati" + +#~ msgid "Basic" +#~ msgstr "Di base" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Estensione aggiornata con successo. Riavviare JOSM." +#~ msgstr[1] "{0} Estensioni aggiornate con successo. Riavviare JOSM." + +#~ msgid "Delete and Download" +#~ msgstr "Elimina e Scarica" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato." + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor relazione: {0}" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Selezionare almeno un nodo, percorso o relazione. Solo gli elementi già " +#~ "caricati hanno uno storico." + +#~ msgid "Move Up" +#~ msgstr "Sposta in alto" + +#~ msgid "Move Down" +#~ msgstr "Sposta in basso" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Questa azione richiederà {0} richieste individuali di scaricamento. Si " +#~ "desidera continuare?" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Un errore è stato rilevato durante il tentativo di correlare le foto al " +#~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale." + +#~ msgid "Edit Drawbridge" +#~ msgstr "Modifica ponte levatoio" + +#~ msgid "Edit Portcullis" +#~ msgstr "Modifica saracinesca" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "" +#~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:" + +#~ msgid "sports" +#~ msgstr "Articoli sportivi" + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Pagina di aiuto mancante. Crearla in italiano." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Pagina di aiuto mancante. crearla in italiano oppure " +#~ "la propria lingua." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Carica i file TCX direttamente da JOSM." + +#~ msgid "" +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." +#~ msgstr "" +#~ "La caratteristica principale dell'estensione è la possibilità di " +#~ "eliminare i punti del tracciato GPX. Questa estensione può essere " +#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad " +#~ "esempio eliminando le parti che non interessano di un tracciato." + +#~ msgid "Remove route nodes" +#~ msgstr "Rimuovi nodi dell'itinerario" + +#~ msgid "Start routing" +#~ msgstr "Inizia navigazione" + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -23448,92 +24522,4 @@ #~ "\n" #~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflitti: {0}" - -#~ msgid "viaduct" -#~ msgstr "viadotto" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "" -#~ "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico" - -#~ msgid "sports" -#~ msgstr "Articoli sportivi" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert " -#~ "corrente {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Elimina e Scarica" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato." - -#~ msgid "Solve Conflict" -#~ msgstr "Risolvi conflitto" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Selezionare almeno un nodo, percorso o relazione. Solo gli elementi già " -#~ "caricati hanno uno storico." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Questa azione richiederà {0} richieste individuali di scaricamento. Si " -#~ "desidera continuare?" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Un errore è stato rilevato durante il tentativo di correlare le foto al " -#~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "" -#~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Modifica ponte levatoio" - -#~ msgid "Edit Portcullis" -#~ msgstr "Modifica saracinesca" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Pagina di aiuto mancante. Crearla in italiano." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Pagina di aiuto mancante. crearla in italiano oppure " -#~ "la propria lingua." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Carica i file TCX direttamente da JOSM." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "La caratteristica principale dell'estensione è la possibilità di " -#~ "eliminare i punti del tracciato GPX. Questa estensione può essere " -#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad " -#~ "esempio eliminando le parti che non interessano di un tracciato." - -#~ msgid "Remove route nodes" -#~ msgstr "Rimuovi nodi dell'itinerario" - -#~ msgid "Start routing" -#~ msgstr "Inizia navigazione" #~ msgid "Error processing changeset upload response" @@ -23557,21 +24543,24 @@ #~ "Non caricare altri dati dopo questo messaggio." +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Impossibile leggere valori numerici dalla risposta" -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta" +#~ msgid "linked" +#~ msgstr "collegato" + +#~ msgid "Overlap tiles" +#~ msgstr "Sovrapponi tiles" + +#~ msgid "% of lat:" +#~ msgstr "% di lat:" + +#~ msgid "% of lon:" +#~ msgstr "% di lon:" #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile." - -#~ msgid "Overlap tiles" -#~ msgstr "Sovrapponi tiles" - -#~ msgid "% of lat:" -#~ msgstr "% di lat:" - -#~ msgid "% of lon:" -#~ msgstr "% di lon:" #~ msgid "Resolve conflicts in member list of of relation {0}" @@ -23591,10 +24580,10 @@ #~ "sull'unione." +#~ msgid "Undeleting relation..." +#~ msgstr "Ripristino relazione..." + #~ msgid "Undeleting Way..." #~ msgstr "Ripristino via" -#~ msgid "Undeleting relation..." -#~ msgstr "Ripristino relazione..." - #~ msgid "Selection too big" #~ msgstr "Selezione troppo grande" @@ -23605,2 +24594,14 @@ #~ msgid "image loading..." #~ msgstr "caricamento immagine..." + +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Il livello {0} deve essere presente nella lista dei livelli" + +#~ msgid "Sort" +#~ msgstr "Ordina" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Ordina i membri della relazione selezionata o l'intera lista" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Membri: {0} (collegato: {1})" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 16826) +++ /applications/editors/josm/i18n/po/ja.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:28+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-14 17:51+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Japanese \n" @@ -16,82 +16,162 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "メインGUIを作成します。" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "エラー" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。" -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "保存されていない変更" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "保存されていない変更があります。変更分を破棄して継続しますか？" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "保存して終了" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "変更を破棄して終了" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -100,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "キャンセル" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "警告" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "不明" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "情報" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "情報を表示する。" @@ -133,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -144,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -151,19 +291,19 @@ msgstr "バージョン{0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "{0}の最後の変更" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java バージョン {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "ホームページ" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "バグ報告" @@ -173,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "情報" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "はじめにお読みください。" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "リビジョン" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "貢献" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "プラグイン" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "JOSMについて" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "ファイルは存在しませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -212,16 +356,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "警告" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -230,7 +367,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "削除する列を選択してください。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "ほかを選択：" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "ノードの結合" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "ノードを追加..." @@ -242,14 +407,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -257,57 +424,57 @@ msgstr "編集: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "新しいノードの座標を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "十進経緯度を使う。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "緯度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "経度" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "ノードを円形に配列" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "選択したノードを円形に移動します" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -323,25 +490,58 @@ msgstr "ツール: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "少なくとも４つのノードを選択してください。" +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "情報" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "ノードを一直線に配列" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "選択したノードを一直線に並べます。" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "少なくとも3つのノードを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -350,18 +550,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -370,5 +562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -377,46 +569,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "データ" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "レイヤ" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "競合" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "ダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "{0}へズーム" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "{0}のビューへズーム" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -426,30 +618,30 @@ msgstr "表示: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "ズームする選択がありませｎ" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "ズームの対象になる競合はありません" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "ウエイの結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "複数のウエイを一つに結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "結合する少なくとも二つのウエイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "異なるメンバーであるウェイを結合しますか？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -459,13 +651,13 @@ "か？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "強制的に連結。" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "方向を変更しますか?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -473,10 +665,10 @@ msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "逆転して接続" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -484,20 +676,20 @@ msgstr "すべての競合に値を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "競合を解決する" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "ウェイが全て空です。" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -515,23 +707,24 @@ msgstr "選択したオブジェクトをペースト用バッファにコピーします。" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "コピーするものを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "円形を作成します" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "3つのノードから円形を作成します" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "円形内にそのノードはありません。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -539,87 +732,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "削除" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "選択したオブジェクトを削除します" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "上書きする" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "ファイルが存在します。上書きしますか？" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "ノードを等間隔に配置" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "直線に沿って、選択したノードを等間隔に配置します。" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "OSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "地図データをOSMサーバからダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "ファイル: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "ダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "インポートした内容には {0} の競合があります。" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "ダウンロード中にエラーです。" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "複製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "コピー後すぐに貼り付けで複製" @@ -639,5 +867,5 @@ msgstr "アプリケーションを終了します。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -647,58 +875,73 @@ "ラックをアップロードしないでください。" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "GPXにエクスポート" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "データをGPXファイルにエクスポートします。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "エクスポートできません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "gpsトラックの記述" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "著者情報の追加" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "本名" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "eメール" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "事前定義" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright 年" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "キーワード" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "エキスポートのオプション" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "エキスポートして保存" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -709,25 +952,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "エラー" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "事前定義のライセンスを選択" @@ -737,46 +960,49 @@ msgstr "JOSMオンラインヘルプ" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "ブラウザで開く" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "編集" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "再読込" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "JOSMオンラインヘルプからのページのみ編集できます。" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "ページ{0}を読み込む際にエラーが発生しました。" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -812,30 +1038,40 @@ msgstr "ノードを一番近いセグメントに接続します。" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "ノードと線をつなぐ" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "ショートカットなし" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "強制的に結合" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "直下のレイヤーを選択したレイヤーに結合します" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "ノードの結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "一番古いものにノードをマージします。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "結合する少なくとも二つのウエイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "異なったメンバーになっているノードを結合しますか？" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -843,69 +1079,80 @@ msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "強制的に結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" "ノードを結合できません：使用しているウェイを削除しないとけなくなります。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "{0}ノードを結合する" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "選択" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "選択したメンバーを一つ下に移動します" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "鏡像" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "選択したノードやウェイの鏡像を作ります。" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "少なくとも1つはノードかウェイを選んでください。" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "オブジェクト{0}を移動" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "左" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "右" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "移動 {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "オブジェクトの移動 {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "オブジェクトを世界の外に移動できません。" @@ -913,5 +1160,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "新規" @@ -921,26 +1168,17 @@ msgstr "新しい地図を作成します。" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "名前なし" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "開く..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "ファイルを開く" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "\"{0}\"を読み込めません。" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -969,34 +1207,35 @@ msgstr "ダウンロードURL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "直交した形状" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "二つだけのノード選択が許されています" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "ウェイだけを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "ほぼ垂直になっているウェイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "EPSG:4326投影法を使用しています。この投影法では、
長方形の配置を行っ" @@ -1004,9 +1243,9 @@ "更してください。
それでも続けますか？" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "ただ一つだけのノードが選択されています。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "垂直化" @@ -1022,11 +1261,11 @@ msgstr "貼り付けバッファの内容を貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "タグの貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1055,16 +1294,21 @@ msgstr "最後に戻した処理を再度行います。" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "レイヤーの名前変更" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "ファイル名も変える" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "ファイル\"{0}\"の名前を変更できませんでした。" @@ -1078,9 +1322,9 @@ msgstr "選択したウェイ全ての方向を反転します。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "少なくとも１つのウェイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "ウェイ方向反転" @@ -1088,17 +1332,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "保存" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "最新データを保存します。" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "ファイル {0}は存在します。上書きしますか?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1108,25 +1354,25 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "一つも開かれたデータがありませんんで、保存されません。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "空の文書" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "文書にデータが含まれない" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "それでも保存する" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "競合" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1136,54 +1382,75 @@ "れます。続けますか？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "競合を否定して保存する" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "OSMファイルの保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "GPXファイルの保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "レイヤーを保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "ファイルをバックアップできませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "ファイルの拡張子が不明です: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "保存中にエラー発生" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "バックアップファイルから復元するときに、エラーになりました。" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "ファイルの拡張子が不明です" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "保存中にエラー発生" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "バックアップファイルから復元するときに、エラーになりました。" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "名前をつけて保存…" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "現在のデータを新規ファイルに保存" +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "すべて選択" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1217,16 +1484,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "閉じる" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "ウェイを分割" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "選択したノードでウェイを分割" @@ -1236,10 +1503,10 @@ msgstr "現在の選択は分割できません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1252,15 +1519,15 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "選択したノードは同じウエイで共有されていません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." msgstr[0] "選択したウエイは選択したノードをつかって構成されていません。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" @@ -1268,5 +1535,5 @@ "す。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1276,8 +1543,9 @@ "する）" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし" @@ -1285,11 +1553,15 @@ "確認して、必要なら訂正してください。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし" +"た。\n" +"確認して、必要なら訂正してください。" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1310,46 +1582,46 @@ msgstr "グローバル設定 \"{0}\"　のトグル" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "ウェイを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "複数のウェイに使われているノードを複製します。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "このノードは、何とも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "どのノードも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "どのウェイも結合していません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "現在の選択は引き離せません。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "ほかを選択：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* 1つのタグのついたノード、または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* 1つ以上のウェイに使われている1つのノード, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1357,5 +1629,5 @@ "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1363,5 +1635,5 @@ "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1376,9 +1648,9 @@ "コピーが作られ、全てのノードが選択状態になります。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "ノードを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1386,5 +1658,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1400,29 +1672,29 @@ msgstr "最後の操作を戻します" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "選択なし" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "全てのオブジェクトで選択解除" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "全てを非選択(Focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "全てを非選択（Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "データの更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" @@ -1430,113 +1702,62 @@ "ターの再ダウンロード)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"更新するデータは見つかりませんでした。もう既にデータレイヤーを開いているか、" -"ダウンロードしましたか？" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "GPXデータのレイヤーがありません" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "OSMにアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "OSMサーバにすべての変更をアップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "追加するオブジェクト:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "修正するオブジェクト:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "削除するオブジェクト:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "アップロードする変更の概略コメントを入力してください。" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "この変更をアップロードしますか?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "変更のアップロード" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "未解決の競合があります。まずこれらの競合を解決してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "アップロードする変更はありません。" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1550,17 +1771,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1571,53 +1792,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "OSMサーバにすべての変更をアップロードします。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "追加するオブジェクト:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "修正するオブジェクト:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +msgid "Objects to delete:" +msgstr "削除するオブジェクト:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "アップロードする変更の概略コメントを入力してください。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 +msgid "Upload these changes?" +msgstr "この変更をアップロードしますか?" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +msgid "Upload Changes" +msgstr "変更のアップロード" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 +msgid "Uploading" msgstr "" @@ -1706,42 +1938,54 @@ msgstr "ゆっくり再生" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "GPSデータをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "ダウンロードされたGPXデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "生のGPSデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "データをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "データーはインポートされませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMapデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "ダウンロード {1}のうち{0} (残り {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "アップロードするデータ" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "次のエラーは、大量ダウンロードのときに起きました。" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "ダウンロード中にエラーです。" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1753,21 +1997,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "削除モード" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "ノードまたはウェイを削除します" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1775,5 +2019,5 @@ msgstr "モード: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1783,760 +2027,23 @@ "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "描画" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "ノードを描画" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "モード: フォーカスを描画" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "選択済の" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "世界の外にノードを追加できません。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "ノードを追加" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "ノードでウェイに追加" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "既存のウェイをノードとつなぎます。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "既存のウェイに新しいノードを追加" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "ウェイのノードを追加して接続" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "新規ノードの作成" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "カーソルの下のノードを選択" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "新規ノードを {0}このウエイに追加します。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "新規ウエイを最後に操作したノードから開始" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "最後に操作したノードからウエイを継続" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "描画の完了" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "押し出し" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "エリアの作成" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "ウエイの延長" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "回転を止めるには、マウスボタンを放します。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー" -"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "選択" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "オブジェクトの選択、移動および回転" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと" -"マージします。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替" -"え);Shft-Ctrlで選択を回転。;選択を変更。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "ズーム" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "ズームと地図の移動" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら" -"移動; 右ドラッグによるズーム" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "検索…" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "オブジェクトを検索する。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "データが読み込まれていません。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "検索文字列を入力してください" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "セレクションを置換" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "セレクションに加える" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "セレクションの削除" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "大/小文字を区別する" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "正規表現検索" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"ベイカー・ストリート - どんなキーや名前の 'ベイカー' と 'ストリート'。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"ベイカー・ストリート\" - どんなキーや名前の 'ベイカー・ストリート'。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Bak - 'Bak' その名前のどこか。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - キー 'type' はどんな値でも良い。 また *=value, " -"type=, *=*, *=もできます。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - その名前の内 'Bak' でない。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "foot: - key=任意の値を入力してください." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "特殊なターゲット:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - オブジェクトの型 (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - 該当ユーザに変更された全オブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - 指定されたIDを持つオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - 指定されたノード番号のオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "変更済み - すべての変更されたオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "選択- すべての選択されたオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "未完了 - すべての未完了のオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "タグなし - すべてのタグなしオブジェクト" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "| や ORを、論理和をとるために使う" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "グループの分類のために ( と ) を使用する。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "検索" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "検索開始" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "\"{0}\"にマッチするものが見つからない" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} の一致が見つかりました" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ" -"セージは:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく" -"ださい: key=value" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして " -"\"relation\"です。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "想定外のトークン: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "orに引数がありません。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "not に引数がありません。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "閉じ括弧があるはずです。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "間違った数のパラメータが、ノード演算子に渡されました。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 -msgid "Load Selection" -msgstr "セレクションのロード" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41 -#, java-format -msgid "Contact {0}..." -msgstr "連絡先 {0} ..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "ダウンロード…" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "URL: \"{0}\"から読み込むことができません" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "URL: \"{0}\"の走査エラー" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Remove \"{0}\" for {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Set {0}={1} for {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "オブジェクト" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Remove \"{0}\" for {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Set {0}={1} for {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "削除 {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "削除 {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "競合中のリレーション" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n" -"関連から削除しますか？" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "関連から削除" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"選択\"{0}\" は、関連 \"{1}\" で使われています。\n" -"関連から削除しますか？" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "ウェイのセグメントを分割" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"ダウンロードしたエリア外のノードを削除しようとしています。
（あなたが見て" -"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き" -"起こします。
本当に削除しますか？" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "移動" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "ノード" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "シーケンス" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "適用しますか?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ" -"ロパティーに対する以下の変更が推奨されます。" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "関連" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "古いロール" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "新しいロール" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "古いキー" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "古い値" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "新しいキー" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "新しい値" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "選択した変更を適用します" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "変更を適用しません" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "適用したいプロパティの変更を選択してください。" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "プロパティ " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "次を参照する関連中のロール" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "自動タグ修正" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "不正な設定がファイルの{0}行目にあります。" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "情報ディレクトリを読み取れません: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" -"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "設定は{0}に保存" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "設定をアップロードできませんでした。理由: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "サーバから設定をロードできませんでした。" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2548,7 +2055,797 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "描画" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "ノードを描画" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "モード: フォーカスを描画" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "選択済の" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "世界の外にノードを追加できません。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "ノードを追加" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "ノードでウェイに追加" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "既存のウェイをノードとつなぎます。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "既存のウェイに新しいノードを追加" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "ウェイのノードを追加して接続" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "新規ノードの作成" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "カーソルの下のノードを選択" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "新規ノードを {0}このウエイに追加します。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "新規ウエイを最後に操作したノードから開始" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "最後に操作したノードからウエイを継続" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "描画の完了" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "押し出し" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "エリアの作成" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "ウエイの延長" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "回転を止めるには、マウスボタンを放します。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー" +"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "選択" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "オブジェクトの選択、移動および回転" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと" +"マージします。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替" +"え);Shft-Ctrlで選択を回転。;選択を変更。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "ズーム" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "ズームと地図の移動" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"ドラッグによるズーム、Ctrl+\".\" or Ctrl+\",\"; Ctrl+\"↑/←/↓/→\" を押しながら" +"移動; 右ドラッグによるズーム" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "検索…" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "オブジェクトを検索する。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "検索文字列を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "セレクションを置換" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "セレクションに加える" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "セレクションの削除" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "大/小文字を区別する" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "正規表現検索" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"ベイカー・ストリート - どんなキーや名前の 'ベイカー' と 'ストリート'。" + +#: ../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 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - キー 'type' はどんな値でも良い。 また *=value, " +"type=, *=*, *=もできます。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "-name:Bak - その名前の内 'Bak' でない。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "foot: - key=foot set to any value." +msgstr "foot: - key=任意の値を入力してください." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "Special targets:" +msgstr "特殊なターゲット:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - オブジェクトの型 (node, way, relation)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +msgid "user:... - all objects changed by user" +msgstr "user:... - 該当ユーザに変更された全オブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +msgid "id:... - object with given ID" +msgstr "id:... - 指定されたIDを持つオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +msgid "nodes:... - object with given number of nodes" +msgstr "nodes:... - 指定されたノード番号のオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "変更済み - すべての変更されたオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "選択- すべての選択されたオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "未完了 - すべての未完了のオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "タグなし - すべてのタグなしオブジェクト" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "| や ORを、論理和をとるために使う" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "グループの分類のために ( と ) を使用する。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "検索" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "検索開始" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "\"{0}\"にマッチするものが見つからない" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "{0} の一致が見つかりました" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ" +"セージは:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてく" +"ださい: key=value" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"不明なプリミティブタイプです: {0}. 許される値は、\"node\", \"way\" そして " +"\"relation\"です。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "想定外のトークン: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "orに引数がありません。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "not に引数がありません。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "閉じ括弧があるはずです。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "間違った数のパラメータが、ノード演算子に渡されました。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "セレクションのロード" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "連絡先 {0} ..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "ダウンロード…" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "URL: \"{0}\"から読み込むことができません" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "URL: \"{0}\"の走査エラー" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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 "Remove \"{0}\" for {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "オブジェクト" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Remove \"{0}\" for {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Set {0}={1} for {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "矛盾の解決" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "\"{0}\"にマッチするものが見つからない" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "削除 {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 +#, java-format +msgid "Delete {0} {1}" +msgstr "削除 {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +msgid "Conflicting relation" +msgstr "競合中のリレーション" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" +"Delete from relation?" +msgstr "" +"選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n" +"関連から削除しますか？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +msgid "Delete from relation" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"選択\"{0}\" は、関連 \"{1}\" で使われています。\n" +"関連から削除しますか？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "ウェイのセグメントを分割" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"ダウンロードしたエリア外のノードを削除しようとしています。
（あなたが見て" +"いない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を引き" +"起こします。
本当に削除しますか？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "移動" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "ノード" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "シーケンス" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "適用しますか?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"このウェイを反転するならば、データの一貫性を保つため、ウェイとそのノードのプ" +"ロパティーに対する以下の変更が推奨されます。" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "関連" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "古いロール" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "新しいロール" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "古いキー" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "古い値" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "新しいキー" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "新しい値" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "選択した変更を適用します" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "変更を適用しません" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "適用したいプロパティの変更を選択してください。" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "プロパティ " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "次を参照する関連中のロール" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "自動タグ修正" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "不正な設定がファイルの{0}行目にあります。" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 +#, java-format +msgid "Cannot open preferences directory: {0}" +msgstr "情報ディレクトリを読み取れません: {0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 +#, java-format +msgid "Preferences file had errors. Making backup of old one to {0}." +msgstr "" +"設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作ります。" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "設定は{0}に保存" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "設定をアップロードできませんでした。理由: {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "サーバから設定をロードできませんでした。" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2577,5 +2874,5 @@ msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2584,62 +2881,62 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "不完全" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" msgstr[0] "ウェイ" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" msgstr[0] "関連" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2652,23 +2949,23 @@ msgstr[0] "{0} メンバー" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "道路" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "鉄道" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "水路" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "土地利用" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2722,5 +3019,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "領域を指定するウエイが閉じていません。" @@ -2858,9 +3155,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2877,5 +3169,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "背景" @@ -2886,8 +3178,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2903,5 +3195,5 @@ "新しいレイヤーを新しいゾーンで開始してください。" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "ランベルトゾーン（フランス）" @@ -2924,22 +3216,126 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "ブックマークを読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "ブックマークを書き込みできません。" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "今後は表示しない" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "不明な" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "予期しない例外" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "不明なホスト" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "今日のメッセージはありません" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- 起動中のバージョンは {0} です。" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "\"今日のメッセージ\"をダウンロード" @@ -3020,62 +3416,57 @@ msgstr "パスワード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "Unable to find translation for the locale {0}. Reverting to {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "使用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "オプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "このヘルプの表示" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "標準のunix配置引数" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "bounding boxをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "ファイルを開く（.gpxの場合生のGPSとして)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "bounding boxを生GPSとしてダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "検索から選択" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "最大モードで起動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "設定を既定に戻します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "言語の変更" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3085,51 +3476,51 @@ "読み込まれることにご注意ください。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "--download=のかわりに osm://を指定できます。\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "アップデートしたプラグインの活性化" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "早期読み込みプラグインのロード中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "デフォルト設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "プラグインのロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "ファイル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3137,21 +3528,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "ワイヤー・フレーム表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "ワイヤー・フレーム表示切り替え" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "全画面表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "フルスクリーン表示のトグル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "音声" @@ -3195,53 +3586,68 @@ msgstr "拡大・縮小" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "マウスポインターで示される地理経度" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "マウスポインターで示されるオブジェクトの名前" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "マウスポインターで示される地理緯度" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "描かれている線分の(コンパスの)向き" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "描きたい新規ウェイセグメントの長さ" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(オブジェクトなし)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "レイヤーがリストにありません。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "OSMサーバに接続…" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "解析中にエラー" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "ファイルが見つかりません" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3263,4 +3669,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "初期化" @@ -3292,20 +3699,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3313,47 +3720,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3361,25 +3768,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3416,5 +3823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3425,5 +3832,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3437,5 +3844,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3510,7 +3917,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3584,14 +3990,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3620,10 +4026,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3632,19 +4038,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3653,9 +4059,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3665,13 +4071,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3679,90 +4085,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(なし)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "削除された" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3772,5 +4178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3795,12 +4201,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3845,10 +4250,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3857,10 +4262,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3869,5 +4274,5 @@ msgstr "値" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3927,9 +4332,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3937,5 +4342,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3965,42 +4370,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "とりあえず続ける" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, 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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "競合の解決" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4018,96 +4440,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。" #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "レイヤー" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "全ての読み込んだレイヤのリストを開きます" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "選択したレイヤーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "保存していない変更があります。それでもレイヤーを削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "レイヤー削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "本当にすべてのレイヤーを削除してよろしいですか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "情報" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "はい" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "北" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "削除 {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "選択したレイヤーの表示状態を切り替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "テキスト/アイコンの表示/非表示" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "マーカーテキストとアイコンの表示状態を切り替え" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "レイヤー" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "全ての読み込んだレイヤのリストを開きます" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "私道" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "選択したレイヤーの削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "直下のレイヤーを選択したレイヤーに結合します" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "選択したレイヤーを一つ上に上げます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "選択したレイヤーを一つ下に移動します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "直下のレイヤーを選択したレイヤーに結合します" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "レイヤー：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "情報板" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4115,22 +4571,28 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "空の値でキーを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4138,84 +4600,89 @@ msgstr[0] "{0}このオブジェクトのプロパティーの変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "値を選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "プロパティを変えたいオブジェクトを選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "選択されたオブジェクトのプロパティ" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "関連の変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "本当に関連{0}から選択分を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "プロパティの編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "プロパティの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "すべてのオブジェクトの選択したキーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "プロパティ: {0} / メンバー: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "プロパティ/メンバー" @@ -4224,63 +4691,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "リレーション: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "選択したリレーションの編集画面を開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "選択したリレーションを削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "リレーション: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "選択したリレーションの編集画面を開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "選択したリレーションを削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "現在の選択範囲" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "セレクションリスト　ウインドウを開きます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "選択したエレメントのズーム" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "選択したリストを更新する。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "セレクションへズーム" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4288,5 +4757,5 @@ msgstr[0] "{0}ウェイ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4294,5 +4763,5 @@ msgstr[0] "{0} 関連" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4303,5 +4772,10 @@ msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4310,143 +4784,410 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "選択したオブジェクトで作業した人たちのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# オブジェクト" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "作者: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "エリアをダウンロードする" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "選択したリレーションを削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "見えるタイルのダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "リレーション" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "プラグイン {0} をダウンロードしています..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "リレーション" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "最後に戻した処理を再度行います。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "現在選択したメンバーを一つ上に移動します" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "選択したメンバーを一つ下に移動します" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "現在選択されている全てのオブジェクトを関連から削除" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "選択したリレーションを削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "接続していません" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "競合中のリレーション" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "最新データを保存します。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "この関連の全ての未完成のウェイとノードをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "メンバーのダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "リモート制御の指示を確認した" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "ズームアウト" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "選択したメンバーを一つ下に移動します" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "変更の適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "基本" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "次によって占められる;" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "継げられた" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "上に移動" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "現在選択したメンバーを一つ上に移動します" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "選択したものを追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "選択の削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "現在選択されている全てのオブジェクトを関連から削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "下に移動" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "選択したメンバーを一つ下に移動します" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "この関連から現在の行のメンバーを削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "メンバーのダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "この関連の全ての未完成のウェイとノードをダウンロード" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "関連の編集者:{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "インポートした内容には {0} の競合があります。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "セレクションのロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4456,5 +5197,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4464,25 +5205,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "ブックマーク" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "最初に目的の座標を入力してください。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "場所の名称を入力してください。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "ロケーションの変更" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "最初にブックマークを選択してください、" @@ -4517,34 +5255,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "データソースと型" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "新しいレイヤーとしてダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "エリアをダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "検索文字列を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "地名検索結果をサーバから読み取ることができませんでした" @@ -4552,5 +5290,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "検索する地名を入れてください：" @@ -4558,5 +5296,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4564,6 +5302,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "名前" @@ -4602,6 +5340,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4624,15 +5362,15 @@ msgstr "タイプ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "近く" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "ズーム" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4641,5 +5379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "スリッピーマップ" @@ -4671,5 +5409,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5411,5 +6155,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5576,197 +6320,187 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "{0} のイメージ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "GPXの読み込み…" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "地点 {0} x {1}に時刻がありません" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "{0}を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "ジオタグのついた画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS開始: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS終了: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "現在の差分: {0} 秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "タイムゾーンの違い: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" msgstr[0] "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "トラック内に {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "時計の同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEGイメージ(*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "ファイル \"{0}\"中の日付が取得できません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "時刻をGPSユニットと同期する" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "入力した時刻は、解釈できません" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "GPSポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "線描画のカスタマイズ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "全体設定を使用" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引く。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "このレイヤーの点の間に線を引かない。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "線描画オプションの選択" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "配色のカスタマイズ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "既定" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "色選択" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "名前のついた地点からのマーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "{0} からの名前付きトラックポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "音声のインポート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "WAV音声ファイル(*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "{0} からの音声マーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "イメージのインポート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5774,5 +6508,5 @@ msgstr[0] "{0} トラック " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5780,5 +6514,5 @@ msgstr[0] "{0}ルート, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5786,30 +6520,30 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "名前: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "記述: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Timespan: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "長さ: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "データレイヤーへ変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5820,43 +6554,43 @@ "てください：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5867,9 +6601,9 @@ "すか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5879,5 +6613,5 @@ "に変更又は移動されました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5887,47 +6621,47 @@ "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "データーレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0}は削除されました)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5951,10 +6685,10 @@ msgstr[0] "トラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" msgstr[0] "ポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5962,5 +6696,5 @@ msgstr[0] "{0}ポイントをもつトラック" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5968,5 +6702,5 @@ msgstr[0] "{1}トラックを含む {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5983,5 +6717,5 @@ msgstr[0] "マーカー" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5989,9 +6723,9 @@ msgstr[0] "{0}は、{1}マーカーからなる" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "音声の同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6000,20 +6734,20 @@ "す。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "地点 {0}で音声同期をとります" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "再生されているレイヤーと同期させることができません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "再生の最初に音声マーカーを作成します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6021,10 +6755,17 @@ msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "テキスト/アイコンの表示/非表示" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "マーカーテキストとアイコンの表示状態を切り替え" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6034,5 +6775,5 @@ "グする必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6042,29 +6783,29 @@ "ントの上に持ってくる必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "新しいオーディオマーカーを生成できません" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "このマーカーのURLを表示するときにエラーが発生しました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URLは： " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "URL を表示する際にエラー" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "高度な設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "設定項目を直接変更。利用に注意！" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6072,26 +6813,26 @@ msgstr "検索: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "現在の値は既定値です。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "既定値は \"{0}\"です。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "不明なときの既定値(設定はまだ使われません）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "編集する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6099,14 +6840,14 @@ msgstr "新しい値は{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "削除する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "新しいキー/値の組を入力" @@ -6241,40 +6982,40 @@ msgstr "ボイスレコーダの調整" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "塗りつぶしスタイル{0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "レイヤ{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "{0}の色を選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "全てを既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "JOSMの異なるオブジェクトが使う配色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "色" @@ -6607,46 +7348,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "利用可能なプラグインを設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "リストをダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "アップデート" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "サイトの設定..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "JOSM プラグイン情報のURLの追加" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "エントリーを選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "JOSM プラグイン情報のURLを編集" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "JOSM プラグイン情報のURLの追加" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "プラグインサイトを設定" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "表示設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6654,29 +7404,29 @@ msgstr "プログラム全体の見た目に影響する各種設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "接続設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "OSMサーバへの接続設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "マップ設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "地図投影法とデータ解釈の設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "オーディオ設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "オーディオプレイヤーと音声マークの設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "設定を有効にするにはJOSMを再起動する必要があります。" @@ -6777,59 +7527,61 @@ msgstr "ショートカット" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "コピーする列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "リストから選択した情報源を削除" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7003,33 +7755,33 @@ msgstr "修飾グループ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "この機能の詳細情報" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "プリセット \"{0}\"を使います" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7040,15 +7792,15 @@ msgstr "タグの事前設定ソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7057,18 +7809,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "プロパティを変更する" @@ -7079,33 +7831,36 @@ msgstr "プリセットグループ \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "OSMサーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "{1}にポイント{0}をダウンロード中..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "OSMデータをダウンロード中..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "データを準備中..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "\"{0}\"を読み込めません。" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7113,21 +7868,21 @@ msgstr "GPXファイル" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "{0} からのオーディオマーカー" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7143,10 +7898,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "OSMデータをダウンロード中..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7154,48 +7928,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183ファイル" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "座標をインポートしました。 " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "不正なセンテンス: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "チェックサムエラー " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "不明なセンテンス: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "ゼロ座標: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEAのインポートに成功しました。" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEAのインポートに失敗しました。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7206,15 +7979,15 @@ "は、 {0} から {1}をサポートするといっています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7222,23 +7995,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "変更セットを開いています…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "アップロード中..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "ディレクトリ {0} を走査" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7281,9 +8067,4 @@ msgid "Login" msgstr "ログイン" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "中止します..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7334,66 +8115,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "パース中にエラーが発生しています" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSMサーバファイル" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "バージョン番号は不明です" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "OSMデータにバージョン番号が欠けています。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "不明なバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "ウエイ以外で要素が見つかりました" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " はゼロ参照です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "要素がリレーション以外に見つかりました" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "リレーション {0}のメンバーに属性\"ref\"がかけています。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "ref=0の不完全な指定です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "id=0の禁じられたオブジェクトです" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7401,51 +8186,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "必要な属性\"{0}\"がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "OSMデータを準備します…" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "III-形式のノードID" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "サーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7454,16 +8272,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "プラグインのアップデート" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "ダウンロードプラグイン" @@ -7480,5 +8293,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7487,23 +8300,23 @@ "{0} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "プラグイン {0} をダウンロードしています..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "プラグインをダウンロード" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7514,14 +8327,12 @@ msgstr "プラグイン {0} でエラーが発生しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "警告 - {0}プラグインのロードを要求されています。このプラグインはもう必須では" "ありません。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." @@ -7530,5 +8341,5 @@ "す。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -7536,15 +8347,15 @@ "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "プラグインが見つかりません： {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "プラグインが最後に更新されてから{0}日以上経過しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7554,21 +8365,21 @@ "warntime'を編集することで変更できます）" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "このプラグインを使用不可にする" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "プラグイン {0} を読み込めません。設定から削除しますか？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "プラグインを継続" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7578,5 +8389,5 @@ "上書きできる権限があるかどうか、確認してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7584,10 +8395,10 @@ msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "このプラグインから得られる情報では、作者は {0} です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7596,9 +8407,9 @@ "い。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "このプラグインを使用不可にしますか?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7608,26 +8419,23 @@ "再起動してください。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"プラグインを削除できませんでした。JOSMを入手した方に問題を報告してください。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "情報" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "プラグイン情報が見つかりません。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "説明がありません" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "もっと詳細" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7635,13 +8443,18 @@ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "プラグイン情報が見つかりません。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "インストールされた全てのプラグインは最新です。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7654,9 +8467,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "不足するプラグインをダウンロードします。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7669,57 +8482,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "不明な" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "JOSMに付属のプラグイン" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Error reading plugin information file: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "これは記録の最後より後ろにあります。" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "サウンドの再生でエラーが発生しています" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "何もしない" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "バグを報告する" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7734,18 +8525,18 @@ "大目にみて、ぜひバグレポートをぜひお願いします。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "予期しない例外" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "{0}でトラブルチケットを報告してください。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "（できる限り詳細に）エラーが発生するまでの手順を含めてください！" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7755,17 +8546,33 @@ "ださい。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "必ず次の情報を含めること:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(テキストはクリップボードにコピーされています。)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "今後は表示しない" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7779,5 +8586,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7787,5 +8594,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7796,13 +8603,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(ヒント:設定でショートカットキーを選べます。)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "格子状のウェイの作成" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7812,21 +8634,21 @@ "子状のウエイ構造をつくります。" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "共通のノードを持つ2つのウェイを選択してください" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "共通の1つだけのノードで、2つのウェイを選択してください。" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "ウェイの格子を作る。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "トレースをアップロード" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7834,74 +8656,75 @@ msgstr "トレースのアップロード" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "公開" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "説明" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "あなたのトレースについて説明を記入して下さい" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "あなたのトレースについて属性タグを記入して下さい" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "選択したトラック{0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "接続中..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "アップロードを中止" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "アップロードする際にエラー" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPXアップロードが成功しました。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "アップロードに失敗しました。サーバは以下のメッセージを返しました： " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "GPSトラックをアップロード中：{0}% ({1} of {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "記述が与えられていません。なにか記入してください。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPXレイヤーが選ばれていません。トレースのアップロードはできません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "ユーザ名が与えられていません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "パスワードが与えられていません。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPXトラックのアップロード" @@ -7971,33 +8794,34 @@ msgstr "選択したファイルはのひとつは null でした !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "写真を取り込む" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "標準的なディレクトリへのパスを入手できません {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "ディレクトリ {0} を走査" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "ディレクトリからファイルを入手中のエラー {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "GPXに関連づける" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8017,15 +8841,15 @@ msgstr "GPXファイル(*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "{0}の解析中にエラー" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8037,34 +8861,34 @@ "を読み取って、タイムゾーンを選択します。
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "写真の時刻(exifから取得):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "(写真から読み取った)GPSの時刻: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "タイムゾーンの選択: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "日付なし" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "他の写真を開く" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "GPSレシーバーの写真から時刻を同期" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8074,29 +8898,29 @@ "入力する形式を確認してください。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "不正な日付" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPXトラック: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "ほかのGPXトレースを開く" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "タイムゾーン: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "オフセット:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8104,41 +8928,41 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "次の場所を更新： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "すべての画像" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "exif位置のついていない画像" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "まだタグ付けされていない画像" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "GPXトラックに画像を関連づけます。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "関連付け" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "自動推測" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "GPXトラックを選択しなければなりません" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "GPXトラックの選択がありません" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8149,9 +8973,9 @@ "期待する形式: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "不正なタイムゾーン" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8162,26 +8986,26 @@ "期待されるフォーマット: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "不正なオフセット" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPXトラックが読み込まれました" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "選択した写真には時間情報がありません" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "写真は時間情報を含んでいません。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8190,39 +9014,39 @@ "してください。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPXトラックは、時間情報を持っていません。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "タイムゾーン: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "分: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "秒: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(時差 {0} 日)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8230,13 +9054,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "トラックへのフォトマッチに失敗しました。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "タイムゾーンとオフセットを調整してください。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "デフォルトの値" @@ -8258,5 +9082,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "ファイルの読み込みエラー" @@ -8279,6 +9103,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: 不正な url." @@ -8447,22 +9271,22 @@ msgstr "\"source=...\" を要素に追加しますか？" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "ダウンロード {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "WMSサーバに接続中..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "ビルの作成" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8472,18 +9296,18 @@ "インポートする範囲を1 km2 以下で作成してください。" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "SVG ViewBoxを取り出し..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "境界に最もフィットする抽出..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "行政区画の作成" @@ -8597,6 +9421,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "ブランクのレイヤー" @@ -8625,5 +9449,5 @@ msgstr "都道府県 bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8632,14 +9456,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "キャッシュフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "ランベルトゾーンキャッシュエラー" @@ -8727,4 +9551,9 @@ msgstr "順不同の道をコピーできません。" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "データが読み込まれていません。" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8735,9 +9564,9 @@ msgstr "複製したウェイの作成" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "GPSトラックを編集するためのレイヤーです。" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "匿名時間も含めたGPXレイヤへのコンバート" @@ -8858,30 +9687,30 @@ msgstr "インポート後データを削除" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "デバイスからデータをインポート" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "DG100からデータのインポートしています..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "データ削除のエラー" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "{0} からデータをインポート" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "デバイスにデータがありません" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "接続に失敗しました。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8893,15 +9722,15 @@ "raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsatのインポート" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "" "グローバルサット・データロガー DG1000からGPXレイヤーにデータをインポート" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "インポート" @@ -8992,40 +9821,40 @@ msgstr "画像をImageWayPointで開く" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "方向インデックス'{0}'がありません" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "bboxの中に、開始位置がありませんでした。" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "岸を検索中…" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "現在のところ{0}ノード…" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "キャッシュディレクトリ {0} の作成中にエラーが発生しました." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "トレース" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "キャッシュのチェック…" @@ -9034,26 +9863,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "頂点の削減…" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Douglas-Peuckerの近似を実行します..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "重複したノードの削除中…" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalkerトレース" @@ -9138,7 +9959,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "水域(湖沼)" @@ -9287,9 +10108,9 @@ msgstr "Lakewalkerプラグインの設定" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "イメージタイルのダウンロード…" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "イメージを取得できませんでした" @@ -9531,18 +10352,18 @@ msgstr "不明な問題点の状況" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Visibleを開く…" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "現在のビューで見えるファイルだけを開く" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "一つもビューが開いていません。-境界を判定できません！" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9569,33 +10390,33 @@ msgstr "Firefoxの実行ファイル" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "APIからデータ読み込み" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "選択の変更" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "表示領域を変更" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "全てのリモコン操作を手動で確認" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "リモート制御" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "リモート制御プラグインの設定。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9606,9 +10427,9 @@ "会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "許可されたアクション" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" @@ -9616,20 +10437,20 @@ "求されました。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "リクエストの詳細: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "本当にこれを許可してよろしいですか？" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "リモート制御の指示を確認した" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9895,4 +10716,25 @@ msgstr "強調" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10139,34 +10981,34 @@ msgstr "特定の場所へジャンプできるダイアログを開始" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "移動する位置の緯度経度を入力" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "www.openstreetmap.orgから、URLを貼り付けることもできます。" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "ズーム（メートル単位）" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "そこへジャンプ" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "ジャンプ先は" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "緯度、経度、ズームを解析することができませんでした。確認をしてください。" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "緯度経度を解釈できません" @@ -10198,6 +11040,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "妥当性検証エラー" @@ -10207,10 +11049,10 @@ msgstr "妥当性検証エラー" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "グリッド" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10299,23 +11141,15 @@ msgstr "データの妥当性を検証" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "エラーのあるデータです。それでもアップロードしますか？" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "妥当性検証ウィンドウを開く" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "問題へズーム" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "検証" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "現在の選択か、全てのデータ一式の検証" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10386,22 +11220,22 @@ msgstr "交差するウェイ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "ノードの複製" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "このテストは全く同じ位置にノードがないことをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "ウェイのノードの複製" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "ウェイのノードの複製" @@ -10474,23 +11308,23 @@ msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "プロパティチェッカー：" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "タグチェッカーライン - {0}: {1}　が不正です。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "スペルチェック行 {0}が不正です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10501,7 +11335,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "不正なタグ/値の組み合わせです" @@ -10509,78 +11343,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "色つけに問題発生" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "キー ''{0}''は不正です。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "値のないタグ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "プロパティキーが不正です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "プロパティのキーとして、不正なスペースが入っています。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "値で、空白文字を最初か最後にあるプロパティ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "HTML書式の値を持つプロパティ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "キー ''{0}'' はプリセットにはありません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "プリセットはプロパティキーを含みません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "値 ''{0}'' キー ''{1}'' はプリセットにはありません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "プリセットは属性値を含みません。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "プロパティのキーをチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "高度なプロパティチェッカーを使用" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "タグチェッカーのソース" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10588,82 +11424,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "新しいソースをリストに追加" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "選択したソースの編集" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "データソース" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "プロパティの値をチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "FIXMEをチェック" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Check for paint notes." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "既定のデータファイルを使用。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "既定のデータファイルを使用(推奨)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "既定のスペルチェックファイルを使用" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "既定のスペルチェックファイルを使用(推奨)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "プロパティを修正" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "要素タイプを見つけられませんでした。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "警告レベルを見つけられませんでした" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "不正な表現\"{0}\"" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10808,7 +11644,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "ビル" @@ -10822,5 +11658,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "領域" @@ -10854,10 +11690,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "タグ付けされておらず、かつつながっていないノード" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10911,8 +11747,32 @@ msgstr "陸地の反転：　陸地は左側にない" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10923,10 +11783,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10975,14 +11835,14 @@ msgstr "WMSプラグイン　ヘルプ" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "修正した画像..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10993,26 +11853,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11020,5 +11880,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11028,5 +11888,5 @@ msgstr "選択されたWMSレイヤーの位置を調整してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11035,19 +11895,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "自動ダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11055,88 +11915,88 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "アルファチャンネル" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "ファイルフォーマットエラー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "WMSプラグイン設定" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "メニューの名前" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "メニュー名(既定)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (既定)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "メニュー名とWMS URLを入力" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "既定のコピー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11250,11 +12110,16 @@ msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "地図グリッドを表示する背景レイヤーを提供します。" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11264,10 +12129,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "WMS イメージのベクトル化を支援する" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11275,5 +12140,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11285,5 +12150,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11293,10 +12158,10 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "OpenLayers の背景画面を表示" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -11305,5 +12170,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11311,5 +12176,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11319,5 +12184,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11326,15 +12191,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11343,10 +12208,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "ルーティング能力の提供" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11355,15 +12220,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "表形式でタグ編集のダイアログ・ボックスを提供" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11373,10 +12238,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "一つのブロックからテラスハウスを作成する" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11385,5 +12250,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11392,5 +12257,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11398,11 +12263,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12557,58 +13429,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12622,6 +13442,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "高速道路" @@ -12647,6 +13467,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "国道" @@ -12672,6 +13492,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "都道府県道" @@ -12697,6 +13517,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "主要道路" @@ -12710,5 +13530,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "敷地内道路" @@ -12726,5 +13546,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "敷地内道路" @@ -12758,6 +13578,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "サービス" @@ -12784,6 +13604,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "工事中" @@ -12833,5 +13653,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "ロータリー交差点" @@ -13813,5 +14633,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "沼地、湿地" @@ -15542,27 +16362,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "スポーツ" @@ -18402,7 +19222,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "自転車" @@ -18472,7 +19292,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "徒歩" @@ -18498,5 +19318,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "地下鉄" @@ -18987,13 +19807,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "破棄された" @@ -19035,5 +19855,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "馬" @@ -19253,4 +20073,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "モータースポーツ" + #. color tertiary #. @@ -19285,6 +20167,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "ストリート" @@ -19340,7 +20222,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "車線" @@ -19396,8 +20278,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "線路" @@ -19418,5 +20300,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19430,5 +20312,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19449,5 +20331,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "転回所" @@ -19462,5 +20344,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19475,5 +20357,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "川岸" @@ -19487,5 +20369,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "小川" @@ -19499,5 +20381,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "ドック" @@ -19525,5 +20407,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "水道" @@ -19691,13 +20573,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "人工物" @@ -19759,7 +20641,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19782,10 +20664,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "その他の軌道" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19821,7 +20703,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "古い軌道" @@ -19866,6 +20748,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "空路" @@ -19879,5 +20761,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "駅" @@ -19899,5 +20781,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "空路（暗色）" @@ -19911,5 +20793,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "空路（明色）" @@ -19957,7 +20839,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "リフト" @@ -19974,5 +20856,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "初球者スキーコース" @@ -19987,5 +20869,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "中級者スキーコース" @@ -20000,5 +20882,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "上級者スキーコース" @@ -20013,5 +20895,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "熟練者用のゲレンデ" @@ -20026,5 +20908,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "フリースタイルのゲレンデ" @@ -20039,5 +20921,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "初心者スキーゲレンデ" @@ -20142,10 +21024,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "電力" @@ -20159,5 +21041,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "桟橋" @@ -20171,5 +21053,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "パイプライン" @@ -20297,12 +21179,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "レジャー" @@ -20316,5 +21198,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "マリーナ" @@ -20386,8 +21268,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "アメニティ" @@ -20489,10 +21371,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "アメニティ_交通" @@ -20878,22 +21760,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "アメニティ_信号" @@ -20925,6 +21807,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "信号_水域" @@ -20985,8 +21867,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "健康" @@ -21339,26 +22221,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "店" @@ -21430,8 +22312,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "ホテル" @@ -21581,9 +22463,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "旅行関係" @@ -21655,8 +22537,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "史跡" @@ -21727,8 +22609,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "緑" @@ -21742,5 +22624,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "石切り場" @@ -21754,5 +22636,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "埋め立て地" @@ -21774,5 +22656,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "水たまり、窪地" @@ -21786,5 +22668,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "森" @@ -21798,5 +22680,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "農地" @@ -21819,5 +22701,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "小売りの商用地" @@ -21831,5 +22713,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "工業地" @@ -21843,5 +22725,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "使用していない工業地" @@ -21855,5 +22737,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "緑地" @@ -21867,5 +22749,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "鉄道公園" @@ -21922,7 +22804,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "軍用地" @@ -21936,5 +22818,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "墓地" @@ -21947,5 +22829,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "山頂" @@ -21960,5 +22842,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "氷河" @@ -21972,5 +22854,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "火山" @@ -22025,8 +22907,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "自然" @@ -22040,5 +22922,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "低木" @@ -22052,5 +22934,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "荒地" @@ -22064,5 +22946,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "森" @@ -22076,5 +22958,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "泥" @@ -22088,5 +22970,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "砂浜" @@ -22164,8 +23046,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "ルート" @@ -22213,7 +23095,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "行政区境" @@ -22355,10 +23237,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "場所" @@ -22406,6 +23288,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "住所" @@ -22702,73 +23584,179 @@ msgstr "" +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" +#~ "か、ダウンロードしましたか？" + +#~ msgid "Layers: {0}" +#~ msgstr "レイヤー：{0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "この関連から現在の行のメンバーを削除" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" +#~ "い。" + +#~ msgid "Validate" +#~ msgstr "検証" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "現在の選択か、全てのデータ一式の検証" + #~ msgid "Data Layer" #~ msgstr "データレイヤー" -#~ msgid "Uploading data" -#~ msgstr "アップロードするデータ" - -#~ msgid "Not implemented yet." -#~ msgstr "まだ実装されていません。" +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" + +#~ msgid "Date" +#~ msgstr "日付" + +#~ msgid "Cannot connect to server." +#~ msgstr "サーバに接続できません。" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "リストを更新するために再読込のクリック" + +#~ msgid "Commit comment" +#~ msgstr "コメントを反映します" + +#~ msgid "Server does not support changesets" +#~ msgstr "サーバは変更した設定をサポートしていません" + +#~ msgid "Aborting..." +#~ msgstr "中止します..." + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" +#~ "て試してください。" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" + +#~ msgid "Revert" +#~ msgstr "取り消す" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "OSMサーバに接続…" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSMアカウントのログイン名（email)" + +#~ msgid "OSM username (email)" +#~ msgstr "OSMユーザ名（email）" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" +#~ "ウンロードしますか？\n" +#~ "{0}" + +#~ msgid "Plugin already exists" +#~ msgstr "プラグインはすでに存在しています" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Rotate" +#~ msgstr "回転" + +#~ msgid "Change" +#~ msgstr "更新" + +#~ msgid "true" +#~ msgstr "真" + +#~ msgid "false" +#~ msgstr "偽" + +#~ msgid "position" +#~ msgstr "位置" + +#~ msgid "different" +#~ msgstr "差異" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" #~ msgid "Email" #~ msgstr "Email" -#~ msgid "Resolve Conflicts" -#~ msgstr "競合の解決" - -#~ msgid "There were conflicts during import." -#~ msgstr "インポート中に競合を発見しました。" +#~ msgid "unnamed" +#~ msgstr "名前なし" + +#~ msgid "Import TCX File..." +#~ msgstr "TCXファイルをインポート" + +#~ msgid "image not loaded" +#~ msgstr "画像が読み込まれていません。" + +#~ msgid "Navigation" +#~ msgstr "ナビゲーション" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Drawbridge" +#~ msgstr "跳ね橋" + +# http://en.wikipedia.org/wiki/Portcullis +#~ msgid "Portcullis" +#~ msgstr "城の格子戸" + +#~ msgid "sports" +#~ msgstr "スポーツ店" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "タグ（空の値でタグ自身を削除）" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" + +#~ msgid "Error parsing server response." +#~ msgstr "サーバからの応答内容が不正です。" #~ msgid "Object" #~ msgstr "オブジェクト" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" - -#~ msgid "my version:" -#~ msgstr "私のバージョン:" - -#~ msgid "their version:" -#~ msgstr "相手のバージョン:" - -#~ msgid "resolved version:" -#~ msgstr "解決したバージョン:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSMアカウントのログイン名（email)" - -#~ msgid "OSM username (email)" -#~ msgstr "OSMユーザ名（email）" - -#~ msgid "Unknown host" -#~ msgstr "不明なホスト" - -#~ msgid "position" -#~ msgstr "位置" - -#~ msgid "different" -#~ msgstr "差異" - -#~ msgid "true" -#~ msgstr "真" - -#~ msgid "false" -#~ msgstr "偽" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決" - -#~ msgid "Change" -#~ msgstr "更新" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "リストを更新するために再読込のクリック" - -#~ msgid "Revert" -#~ msgstr "取り消す" - -#~ msgid "Date" -#~ msgstr "日付" #~ msgid "" @@ -22779,152 +23767,45 @@ #~ "へと戻します。" -#~ msgid "Rotate" -#~ msgstr "回転" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "タグ（空の値でタグ自身を削除）" - -#~ msgid "Error parsing server response." -#~ msgstr "サーバからの応答内容が不正です。" - -#~ msgid "Cannot connect to server." -#~ msgstr "サーバに接続できません。" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "site-josm.xmlかWikiページを追加する。" - #~ msgid "Tagging preset source" #~ msgstr "事前に設定した情報源をタグ付け" -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "新しいタグプリセット源をリストに追加する。" - #~ msgid "Tagging preset sources" #~ msgstr "事前設定の情報源をタグ付け" -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" -#~ "て試してください。" - -#~ msgid "Commit comment" -#~ msgstr "コメントを反映します" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" - -#~ msgid "Navigation" -#~ msgstr "ナビゲーション" - -#~ msgid "image not loaded" -#~ msgstr "画像が読み込まれていません。" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" -#~ "した状態で移動させる。選択：クリック。" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" +#~ msgid "my version:" +#~ msgstr "私のバージョン:" + +#~ msgid "their version:" +#~ msgstr "相手のバージョン:" + +#~ msgid "resolved version:" +#~ msgstr "解決したバージョン:" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "TCXファイルをTCXファイルとしてインポート" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "WMSレイヤーの位置を調整" + +#~ msgid "Add Selected" +#~ msgstr "選択したものを追加" + +#~ msgid "Not implemented yet." +#~ msgstr "まだ実装されていません。" + +#~ msgid "Remove Selected" +#~ msgstr "選択の削除" + +#~ msgid "Basic" +#~ msgstr "基本" #~ msgid "rectifier id={0}" #~ msgstr "修正子 ID={0}" -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "WMSレイヤーの位置を調整" +#~ msgid "viaduct" +#~ msgstr "高架橋" #~ msgid "Charge" #~ msgstr "料金" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "米Yahoo (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "サーバは変更した設定をサポートしていません" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "プラグインはすでに存在しています" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "ノードの一部は（ほぼ）一直線上にある" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Drawbridge" -#~ msgstr "跳ね橋" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "米Yahoo (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" - -#~ msgid "Import TCX File..." -#~ msgstr "TCXファイルをインポート" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "TCXファイルをTCXファイルとしてインポート" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" -#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" -#~ "ワードは使用しないでください。" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" -#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "" -#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" - -# http://en.wikipedia.org/wiki/Portcullis -#~ msgid "Portcullis" -#~ msgstr "城の格子戸" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" #~ msgid "" @@ -22941,31 +23822,73 @@ #~ "本メッセージ後は、データのアップロードはやめてください。" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" + #~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" -#~ "ウンロードしますか？\n" -#~ "{0}" +#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" +#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" +#~ "ワードは使用しないでください。" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" +#~ "した状態で移動させる。選択：クリック。" + +#~ msgid "Occupied By" +#~ msgstr "次によって占められる;" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xmlかWikiページを追加する。" + +#~ msgid "Delete and Download" +#~ msgstr "削除とダウンロード" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" +#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" + +#~ msgid "There were conflicts during import." +#~ msgstr "インポート中に競合を発見しました。" #~ msgid "Conflicts: {0}" #~ msgstr "競合: {0}" -#~ msgid "viaduct" -#~ msgstr "高架橋" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" - -#~ msgid "sports" -#~ msgstr "スポーツ店" - -#~ msgid "Delete and Download" -#~ msgstr "削除とダウンロード" - -#~ msgid "Solve Conflict" -#~ msgstr "矛盾の解決" +#~ msgid "Move Down" +#~ msgstr "下に移動" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "関連の編集者:{0}" + +#~ msgid "Move Up" +#~ msgstr "上に移動" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "新しいタグプリセット源をリストに追加する。" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "ノードの一部は（ほぼ）一直線上にある" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Edit Drawbridge" +#~ msgstr "跳ね橋の編集" #~ msgid "" @@ -22981,4 +23904,19 @@ #~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "" +#~ "ヘルプページがありません。英語でそれを作成してくださ" +#~ "い。" + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "ヘルプページがありません。英語もしくは" +#~ "あなたの母国語でそれを作成してください。" + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" + #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -22988,34 +23926,31 @@ #~ "ダーを調整して、手動で写真に合わせることができます。" -#~ msgid "The following errors occured during mass download:" -#~ msgstr "次のエラーは、大量ダウンロードのときに起きました。" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Edit Drawbridge" -#~ msgstr "跳ね橋の編集" +#~ msgid "Remove route nodes" +#~ msgstr "ルートノードの削除" + +#~ msgid "Start routing" +#~ msgstr "ルーティングの開始" #~ msgid "Edit Portcullis" #~ msgstr "城の格子戸の編集" -#~ msgid "Helppage missing. Create it in english." +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "" -#~ "ヘルプページがありません。英語でそれを作成してくださ" -#~ "い。" - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "ヘルプページがありません。英語もしくは" -#~ "あなたの母国語でそれを作成してください。" - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" - -#~ msgid "Remove route nodes" -#~ msgstr "ルートノードの削除" - -#~ msgid "Start routing" -#~ msgstr "ルーティングの開始" +#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "米Yahoo (WebKit GTK)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "米Yahoo (GNOME Fix)" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" + +#~ msgid "linked" +#~ msgstr "継げられた" #~ msgid "" @@ -23034,10 +23969,7 @@ #~ "このメッセージ以降のデータはアップロードしないでください。" +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "不明な理由でデータのアップロードに失敗しました。" + #~ msgid "Cannot read numeric value from response" #~ msgstr "応答から数値を読み取れません。" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "不明な理由でデータのアップロードに失敗しました。" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 16826) +++ /applications/editors/josm/i18n/po/nb.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:33+0000\n" -"Last-Translator: Stian Ellingsen \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-28 20:58+0000\n" +"Last-Translator: Kurt Nielsen \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon." -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Ulagrede endringer" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Lagre og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Forkast og avslutt" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Advarsel" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "Ukjent" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Om" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Om programmet" @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Versjon {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Siste endring på {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java versjon {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Hjemmeside" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Feilrapporter" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Les meg" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisjon" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Bidrag" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Programtillegg" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Om JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Filen finnes ikke." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -213,16 +357,9 @@ "riktig til historikkside for OSM-element. API-URL er «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Velg minst én allerede opplastet node, linje eller relasjon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Advarsel" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -232,7 +369,35 @@ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Velg raden som skal slettes" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Velg:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Samle noder" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Legg til node …" @@ -244,14 +409,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -259,57 +426,57 @@ msgstr "Rediger: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Angi koordinatene for den nye noden." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Bruk desimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Breddegrad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Lengdegrad" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Juster nodene til en sirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Flytt de valgte nodene i en sirkel." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -325,25 +492,58 @@ msgstr "Verktøy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Velg minst fire noder." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Juster nodene til en linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Flytt valgte noder til en rett linje." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Velg minst 3 noder" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -354,18 +554,10 @@ "er {0}, maksimalt er {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "API-krav ikke møtt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Klarte ikke starte API. Prøv igjen senere." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Klarte ikke starte API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -375,5 +567,5 @@ "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -384,46 +576,46 @@ "lengde {2}. Verdiens lengde er {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Forhåndsbetingelse brutt" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "utvalg" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "last ned" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Gå til {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Skaler og flytt skjermbildet til {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -433,30 +625,30 @@ msgstr "Bilde: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Inet utvalg å vise." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -464,13 +656,13 @@ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Sammenføy uansett" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Endre retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -480,10 +672,10 @@ "retningen på noen av linjene?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Snu og sammenføy" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -491,20 +683,20 @@ msgstr "Legg inn verdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Alle linjene var tomme" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -521,111 +713,149 @@ msgstr "Kopier valgte objekter til utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Velg noe å kopiere." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Lag en sirkel" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Lag en sirkel fra tre valgte noder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Valgte noder er ikke i en sirkel." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Venligst velg akkurat to eller tre noder, eller en veg med akkurat to eller " +"tre noder." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Slett" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Slett valgte objekter." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Skriv over" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Jevn fordeling av noder" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Last ned kartdata fra OSM-tjeneren." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Fil: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Last ned" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Velg minst én oppgave å laste ned" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Det oppstod {0} konflikter under import." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Feil under nedlasting" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Fordoble" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn." @@ -645,5 +875,5 @@ msgstr "Avslutt programmet." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -653,58 +883,73 @@ "spor." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Eksporter til GPX …" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Eksporter dataene til GPX-fil." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Ingenting å eksportere. Hent inn data først." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "beskrivelse av sporloggen" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Legg til informasjon om opphavsperson" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Fullt navn" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-post" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Opphavsrett (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Forhåndsvalgt" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "År for opphavsrett" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Stikkord" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Innstillinger for eksport" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Eksporter og lagre" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -715,25 +960,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Feil" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Velg en lisens" @@ -743,46 +968,49 @@ msgstr "JOSM hjelpesider" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Åpne i nettleser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Endre" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Last inn på nytt" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Feil ved nedlasting av {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Hjelpeside mangler. Opprett den på engelsk." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -820,30 +1048,40 @@ msgstr "Inkluder node i nærmeste linjesegment" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Sammenføy node og linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Ingen hurtigtast" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Samle noder allikevel" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Sammenføy laget under med dette." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -853,68 +1091,79 @@ "samle noder?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Samle noder allikevel" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Samle {0} noder" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Oppdaterer de valgte objektene fra tjeneren" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Speilvend" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Speilvend valgte noder og linjer" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Velg minst én node eller linje." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "opp" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Flytt objektene {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "venstre" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "høyre" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Flytt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Flytter Objekter {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan ikke flytte objekter utenfor kartet." @@ -922,5 +1171,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Ny" @@ -930,26 +1179,17 @@ msgstr "Lag et nytt kart." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "uten navn" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Åpne …" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Åpne en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Klarte ikke lese «{0}»" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -978,34 +1218,35 @@ msgstr "Last ned URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Vinkle Form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Bare to noder tillatt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Du kan bare velge linjer." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Velg en eller flere lukkede linjer med minst fire noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Du har valgt EPSG:4326-projeksjon som kan gi uønsket
resultat ved " @@ -1013,9 +1254,9 @@ "
Vil du fortsette?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Bare én node er valgt" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Vinkle (90)" @@ -1031,11 +1272,11 @@ msgstr "Lim inn fra utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Lim inn egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Bruk egenskaper i utklippstavla på alle valgte element." @@ -1063,16 +1304,21 @@ msgstr "Gjør om siste angrede handling." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Endre navn på lag" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Gi nytt navn på fil også" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Klarte ikke gi nytt navn til fila «{0}»." @@ -1086,9 +1332,9 @@ msgstr "Snu retning på alle valgte linjer" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Velg minst én linje" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Snu retning på linjer" @@ -1096,17 +1342,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Lagre" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Lagre gjeldende data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Filen {0} finnes allerede. Vil du skrive over den?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1115,25 +1363,25 @@ "Feilmelding: cannot check conditions for no layer. Send inn en feilmelding." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Ingen åpne dokument å lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokumentet er tomt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Lagre uansett" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1143,54 +1391,77 @@ "du fortsette?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Avvis konflikter og lagre" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Lagre OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Lagre GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Lagre lag" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Kan ikke ta sikkerhetskopi." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Ukjent filtype {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: {0}" +"" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Ukjent filtype." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Det oppsto feil under lagring." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Lagre som …" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Lagre aktive data i ny fil." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Velg alt" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1222,16 +1493,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Lukk" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Splitt linje" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Splitt en linje i den valgte noden." @@ -1241,5 +1512,5 @@ msgstr "Kan ikke splitte med dette utvalget" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1247,5 +1518,5 @@ msgstr[1] "Valgte noder er ikke del av en linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1257,9 +1528,9 @@ msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Valgte noder er ikke på samme linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1267,10 +1538,10 @@ msgstr[1] "Valgt linje inneholder ikke de valgte nodene." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Velg to eller fler noder for å splitte sirkelformet linje." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1280,21 +1551,23 @@ "linjen.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Medlemskap i en relasjon basert på en rolle er kopiert til alle nye linjer.\n" "Sjekk og korriger slik at dette er riktig." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Et relasjonsmedlemskap er kopiert til alle nye linjer.\n" "Sjekk og korriger slik at dette er riktig." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1315,46 +1588,46 @@ 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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Denne noden har ikke knytninger" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Ingen av disse nodene har knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Ingen noder i denne linjen har andre knytninger." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Valgte element har ikke knytninger som kan løses." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Velg:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* En node med egenskaper, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "– En node som brukes av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "– En node som er brukt av flere linjer, og en av linjene, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1362,10 +1635,10 @@ "– En linje som har en eller flere noder, som er brukt av flere linjer, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1378,9 +1651,9 @@ "kopier og alle noder bli valgt." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Node uten tilknytning" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1388,5 +1661,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1402,139 +1675,91 @@ msgstr "Angre siste handling." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Tøm utvalg" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Fjern alle objekter fra utvalg." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Tøm utvalg (Fokus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Tøm utvalg (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Oppdater data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Klarte ikke oppdatere valgte objekter." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Oppdatering feilet" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Fant ikke GPX lag" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Fant ikke objekt med ID {0} i gjeldende datasett" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Mangler objekt" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Oppdater utvalg" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Oppdaterer de valgte objektene fra tjeneren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Det er ingen valgte objekter å oppdatere" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Utvalget er tomt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Last opp til OSM …" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Last opp alle endringer til OSM-tjeneren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objekter som legges til:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objekter som endres:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objekter som slettes:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Laste opp disse endringene?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Last opp endringer" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Ingen endringer å laste opp." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Laster opp" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Oppdaterer objekt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synkroniser kun {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synkroniser hele datasettet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1555,17 +1780,17 @@ "strong> for å gå tilbake og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Konflikt oppdaget" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "Uventet returverdi. Mottok {0}." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1580,61 +1805,65 @@ "strong> for å avbryte operasjonen og fortsette å redigere.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Opplasting til tjeneren feilet fordi nåværende " -"datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Forhåndsbetingelse brutt" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Opplasting feilet fordi et element du prøvde " -"å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Objekt allerede slettet" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +msgstr "Opplasting feilet.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Klarte ikke laste opp til OSM-API" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Oppdaterer objekt" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Last opp alle endringer til OSM-tjeneren." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n" -"Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objekter som legges til:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objekter som endres:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1722,42 +1951,54 @@ msgstr "Spill av sakte" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Laster ned GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Laster ned GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "GPS-rådata" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Laster ned data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, fuzzy, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Ingenting er importert." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Last ned {0} av {1} ({2} gjenstår)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Laster opp data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Følgende feil oppstod under massenedlasting:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Feil under nedlasting" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1774,21 +2015,21 @@ "{2} for å ignorere.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Slettede eller flyttede objekter" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Slettemodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Slett noder eller linjer." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1796,5 +2037,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1804,765 +2045,23 @@ "når linjer slettes. Ctrl: slett objekt med referanse." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Tegn" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Tegn noder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Modus: Tegne Fokus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "valgt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Legg til node" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Legg til node i linje" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Knytt eksisterende linje til node" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Lag ny node." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Veg node under pekeren." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Sett inn ny node i linje." -msgstr[1] "Sett inn ny node i {0} linjer." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Start ny linje fra siste node." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Fortsett samme linje fra siste node." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Avslutt tegning." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Trekk ut" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Tegn områder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Trekk ut linje" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Slipp museknappen for å velge objektene i rektangelet." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Slipp museknappen for å avslutte rotasjon." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Dra et linjesegment for å lage et rektangel." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift" -"+slipp synkroniserer audio i dette punktet." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Velg" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Velg, flytt og roter objekt" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Legg til og flytt en kunstig node til en linje" -msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Flytt elementer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Flytt dem" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Angre flytting" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Slipp museknappen for å avslutte flytting. Bruk Ctrl for sammenføying til " -"nærmeste node." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Objekt flyttes ved å trekke med musepeker; Shift legger objekt til i " -"utvalget (Ctrl slår av/på);\r\n" -"Shift-Ctrl for å rotere utvalget; eller endre utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Forstørr" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Skaler og flytt kart" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Skaler med Ctrl + . og Ctrl + , eller venstre museknapp; flytt med Ctrl + " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Søk …" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Søk etter objekt." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Ingen data lastet inn." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Skriv inn søketekst." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "erstatt utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "legg til i utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "fjern fra utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "skill mellom store/små bokstaver" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regulært uttrykk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -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:85 -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:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Nan – «Nan» finnes innen navnet." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* -– nøkkel «type» med hvilken som helst verdi. Prøv også " -"*=value, type=, *=*, *=." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Spesialsøk:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -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:93 -msgid "user:... - all objects changed by user" -msgstr "user:… – alle objekter redigert av angitt bruker" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:… – objekt med angitt ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:… – objekt med angitt antall noder" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified – alle endrede objekter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected – alle objekter i utvalg" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete – alle uferdige objekter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged – alle objekter uten egenskaper" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -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:101 -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:102 -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:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Bruk \" for å søke etter operatortegn (f.eks. hvis nøkkel inneholder " -"«:»)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Bruk ( og ) for å gruppere uttrykk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Søk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Start søk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Fant ingen treff for «{0}»" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Fant {0} treff" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Regulært uttrykk «{0}» har en feil ved posisjon {1}, feilmelding:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Uventet symbol: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "OR mangler argument." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "NOT mangler argument." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Forventer parentes slutt." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Feil antall parametere for nodes-operator." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller " -"intervall, for eksempel nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Koble til {0} …" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Laster ned …" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Klarte ikke lese fra URL: «{0}»" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Feil i URL: «{0}»" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Feil ved tjenerkommunikasjon." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "Legg til {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "Endre {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Fjern «{0}» i {1} «{2}»" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Sett {0}={1} i {2} «{3}»" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekter" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Fjern «{0}» i {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Sett {0}={1} i {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Løs koordinatkonflikter i {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "kan ikke løse uavgjort konflikt" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Slett {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Slett {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relasjonen har konflikter" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n" -"Vil du slette utvalget fra relasjonen?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Slett fra relasjon" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Splitt linje i segment" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " -"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " -"nå) .
Er du sikker på at du vil slette nodene?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Løs slettekonflikt i {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Flytt" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "node" -msgstr[1] "noder" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Rydder ut 1 objekt" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "fjerner henvisning fra vei {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Advarsel: Rydder ut linje {0} fordi antall noder falt til under 2. Nåværende " -"er {1}." - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "fjerner henvisning fra relasjon {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Løs medlemskonflikter i relasjon {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Roter {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Løs {0} egenskapskonflikter i {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Løs versjonskonflikter for {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Løs nodekonflikter i vei {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Gjennomføre?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Når du snur reningen på denne linjen blir følgende egenskaper endret for å " -"opprettholde dataintegritet." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relasjon" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Tidligere rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Ny rolle" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Tidligere nøkkel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Tidligere verdi" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Ny nøkkel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Ny verdi" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Bruk valgte endringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Ikke bruk endringer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Egenskaper for " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Roller i relasjoner som viser til" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Korriger egenskap automatisk" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Innstillingsfil har feil i linje {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan ikke åpne innstillingsmappe: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Innstillinger lagret i {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Klarte ikke lese innstillinger fra tjener." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2574,8 +2073,807 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "parameter «{0}» må ha en verdi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Tegn" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Tegn noder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "valgt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Legg til node" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Legg til node i linje" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Knytt eksisterende linje til node" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Lag ny node." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Veg node under pekeren." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Sett inn ny node i linje." +msgstr[1] "Sett inn ny node i {0} linjer." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Start ny linje fra siste node." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Fortsett samme linje fra siste node." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Avslutt tegning." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Trekk ut" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Tegn områder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Trekk ut linje" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Slipp museknappen for å velge objektene i rektangelet." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Slipp museknappen for å avslutte rotasjon." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Dra et linjesegment for å lage et rektangel." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Dra og slipp avspillingsmarkør der du vil avspilling skal starte; Shift" +"+slipp synkroniserer audio i dette punktet." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Velg" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Velg, flytt og roter objekt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Legg til og flytt en kunstig node til en linje" +msgstr[1] "Legg til og flytt en kunstig node til {0} linjer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Flytt elementer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Du flyttet mere enn {0} elementer. Flytting av et stort antall elementer er " +"ofte en feil." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Flytt dem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Angre flytting" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Slipp museknappen for å avslutte flytting. Bruk Ctrl for sammenføying til " +"nærmeste node." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Objekt flyttes ved å trekke med musepeker; Shift legger objekt til i " +"utvalget (Ctrl slår av/på);\r\n" +"Shift-Ctrl for å rotere utvalget; eller endre utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Forstørr" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Skaler og flytt kart" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Skaler med Ctrl + . og Ctrl + , eller venstre museknapp; flytt med Ctrl + " +"piltaster; flytt utsnitt med høyre museknapp" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Søk …" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Søk etter objekt." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Skriv inn søketekst." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "erstatt utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "legg til i utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "fjern fra utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "skill mellom store/små bokstaver" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regulært uttrykk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +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 +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 +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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* -– nøkkel «type» med hvilken som helst verdi. Prøv også " +"*=value, type=, *=*, *=." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Spesialsøk:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +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 +msgid "user:... - all objects changed by user" +msgstr "user:… – alle objekter redigert av angitt bruker" + +#: ../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 +msgid "modified - all changed objects" +msgstr "modified – alle endrede objekter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected – alle objekter i utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete – alle uferdige objekter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged – alle objekter uten egenskaper" + +#: ../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" + +#: ../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 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Bruk \" for å søke etter operatortegn (f.eks. hvis nøkkel inneholder " +"«:»)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Søk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Start søk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Fant ingen treff for «{0}»" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Fant {0} treff" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Regulært uttrykk «{0}» har en feil ved posisjon {1}, feilmelding:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Uventet symbol: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "OR mangler argument." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "NOT mangler argument." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Forventer parentes slutt." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Feil antall parametere for nodes-operator." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller " +"intervall, for eksempel nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Les inn utvalg" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Koble til {0} …" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Feil i URL: «{0}»" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +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}" +msgstr "Legg til {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Endre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Fjern «{0}» i {1} «{2}»" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekter" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Fjern «{0}» i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Sett {0}={1} i {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Endre rolle for relasjonsmedlem {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Løs Konflikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "allerede registrert en konflikt for primitiv \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Fant ingen treff for «{0}»" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " +"tilgjengelig" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Løs koordinatkonflikter i {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Utvalg «{0}» brukes av relasjon «{1}».\n" +"Vil du slette utvalget fra relasjonen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Splitt linje i segment" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Du er i ferd med å slette noder utenfor nedlastet område.
Dette kan skape " +"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se " +"nå) .
Er du sikker på at du vil slette nodene?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Slett fra relasjon" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Løs slettekonflikt i {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Flytt" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "node" +msgstr[1] "noder" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Rydder ut 1 objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "fjerner henvisning fra vei {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Advarsel: Rydder ut linje {0} fordi antall noder falt til under 2. Nåværende " +"er {1}." + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "fjerner henvisning fra relasjon {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Roter {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Løs {0} egenskapskonflikter i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Løs versjonskonflikter for {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Løs nodekonflikter i vei {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "Hoveddatasettet inneholder ikke node {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Gjennomføre?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Når du snur reningen på denne linjen blir følgende egenskaper endret for å " +"opprettholde dataintegritet." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relasjon" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Tidligere rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Ny rolle" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Tidligere nøkkel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Tidligere verdi" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Ny nøkkel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Ny verdi" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Bruk valgte endringer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Ikke bruk endringer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Egenskaper for " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Roller i relasjoner som viser til" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Korriger egenskap automatisk" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Innstillinger lagret i {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Klarte ikke lese innstillinger fra tjener." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "allerede registrert en konflikt for primitiv \"{0}\"" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2603,5 +2901,5 @@ msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2610,27 +2908,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "uferdig" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Feil: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2638,13 +2936,13 @@ msgstr[1] "linjer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "linjer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2652,22 +2950,22 @@ msgstr[1] "relasjoner" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relasjoner" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "endringssett" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "endringssett" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2681,23 +2979,23 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "ferdselsvei" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vannvei" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "bruk av grunn" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2752,5 +3050,5 @@ msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Linje for areal er ikke lukket." @@ -2891,9 +3189,4 @@ "selvmotsigelsen. Beholder lokalt element. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2910,5 +3203,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "bakgrunn" @@ -2919,8 +3212,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2936,5 +3229,5 @@ "og start et nytt lag i en annen sone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert-sone (Frankrike)" @@ -2955,24 +3248,138 @@ #, java-format msgid "UTM Zone {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +msgstr "UTM Sone {0}" + +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Kan ikke lese bokmerke." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Kan ikke lagre bokmerke." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Ikke vis igjen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"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:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Opplasting til tjeneren feilet fordi nåværende " +"datasett
bryter en forhåndsbetingelse.
Feilmelding:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Forhåndsbetingelse brutt" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "ukjent" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "En uventet unntakstilstand" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"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:173 +msgid "Unknown host" +msgstr "Ukjent vert" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Opplasting feilet fordi et element du prøvde " +"å
slette allerede er slettet på tjeneren.

Feilmelding:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Objekt allerede slettet" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, fuzzy, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Dagens melding er ikke tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- aktive versjon er {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Laster ned \"Dagens melding\"" @@ -3053,62 +3460,57 @@ msgstr "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, 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/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Åpne fil (som rå gps, dersom .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Last ned områdeavgrensing som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Gå tilbake til standardinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Velg språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3118,51 +3520,51 @@ "du prøver --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "I stedet for --download= kan du bruke osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Gjør opplastede programtillegg tilgjengelig" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3170,21 +3572,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Vis akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Slå av/på akselinjer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Slå av/på fullskjerm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Audio" @@ -3228,53 +3630,68 @@ msgstr "målestokk" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Lengdegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Navn på objekt ved musepeker" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Breddegrad ved musepekeren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Vinkel mellom forrige og nåværende linjesegment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Kompassretning på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Lengden på segmentet som tegnes." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "Laget er ikke i lista." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "Lag {0} må være i listen over lag" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Kontakter OSM-tjeneren …" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Feil ved tolking" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3297,4 +3714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Klargjør" @@ -3326,20 +3744,20 @@ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3347,30 +3765,30 @@ msgstr "Noder" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Ingen gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Egenskaper ({0} konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Noder (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3379,17 +3797,17 @@ "linjas nodeliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Noder (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Gjenværende konflikter i denne veiens nodeliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Medlemmer (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3399,25 +3817,25 @@ "denne relasjonens medlemsliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Gjenværende konflikter i denne relasjonens medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "Ingen gjenværende egenskapskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Egenskaper (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Konfliktløsning" @@ -3454,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Lokal versjon" @@ -3463,5 +3881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3477,5 +3895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Tjenerversjon" @@ -3566,7 +3984,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3644,14 +4061,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "parameter «{0}» må ha en verdi" @@ -3682,10 +4099,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "Uventet kolonneindeks: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3696,19 +4113,19 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Kommunikasjon med tjener feilet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Ja, gjenopprett også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nei, avbryt operasjonen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3719,9 +4136,9 @@ "

Vil du gjenopprette også disse nodene?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Gjenopprette ytterligere noder?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3733,13 +4150,13 @@ "slettet på tjeneren.

Vil du gjenopprette også dem?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Gjenopprette avhengige objekter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Egenskaper i det lokate datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3749,90 +4166,90 @@ "elementer når sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Egenskaper i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Slettestatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Synlighetsstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(ingen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "ikke slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "ikke synlig (på tjeneren)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Behold en klone av den lokale versjonen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Slett fra det lokale datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Behold lokale koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Behold tjenerens koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Fjern avgjørelse fra koordinatkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Behold lokal slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Behold tjenerens slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Fjern avgjørelse fra slettekonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Behold lokal synlighetsstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Ja, nullstill ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Nei, avbryt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3845,5 +4262,5 @@ "
Er dette OK?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Nullstill ID" @@ -3870,12 +4287,11 @@ msgstr "Fjern fra datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Fjern avgjørelse fra visningskonflikt" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3920,10 +4336,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3932,10 +4348,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3944,5 +4360,5 @@ msgstr "Verdi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap" @@ -4002,9 +4418,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4012,5 +4428,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4040,41 +4456,45 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Løs konflikter" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Avbryt konfliktløsning og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Bruk løsninger" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Bruk ufullstendige løsninger" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Fortsett uansett" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"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 "" "Du har ikke løst alle konfliktene ennå.
Trykk {0} " @@ -4083,4 +4503,17 @@ "å løse konflikter." +#: ../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 "Løs konflikter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Løs versjonskonflikter for {0} {1}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 @@ -4098,96 +4531,130 @@ "Klarte ikke laste historikk fra tjeneren. Detaljer:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "Indeks er utenfor rekkevidde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Historikkobjekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Vis historikken for det valgte objektet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Lag" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Liste over alle innleste lag" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Slett valgt Lag." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Noen endringer er ikke lagret. Slett allikevel?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Slett Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Vil du virkelig slette hele laget?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Slett" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Slett {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Vis/Skjul" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Slå av/på visning av Lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Vis/skjul tekst/ikoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Slå av/på visning av tekst/ikoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Lag" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Liste over alle innleste lag" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Slett valgt Lag." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Sammenføy laget under med dette." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Flytt laget en rad opp." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Flytt laget en rad ned." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Sammenføy laget under med dette." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Lag: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Informasjonstavle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4196,22 +4663,28 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Nøkkelen blir ikke lagret når den er tom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4220,84 +4693,89 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Velg de objekter, du vil rette egenskaper for." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Legg til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Endre Oppsett" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "DSlett egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" @@ -4306,63 +4784,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Åpne en liste over alle relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Slet valgt relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Oprett ny relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relasjoner: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Slet valgt relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Aktuelt utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Åpne vindu med en utvalgsliste" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zoom til valgt(e) element" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Oppfrisk utvalgslisten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zoom til utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4371,5 +4851,5 @@ msgstr[1] "{0} linjer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4378,5 +4858,5 @@ msgstr[1] "{0} relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4387,149 +4867,425 @@ msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Opphavsmenn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Åbn en liste af brugere som jobber på de valgte objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Opphavsmann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Opphavsmenn: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Last ned medlemer av relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Last ned område" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Slet valgt relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Last ned synlige kartbilder" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Konflikter i data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Ingen relasjoner er valgt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Laster ned programtillegg {0} …" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Fjernede Element fra Relasjoner" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Klarte ikke oppdatere valgte objekter." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Flytt valgte medlem opp" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Flytt valgt medlem ned" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Fjern alle valgte objekt fra relasjon" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Slet valgt relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Fortsett å løse" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konflikter i data" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Lagre gjeldende data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Last ned alle ufullstendige linjer og noder i relasjonen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Last ned medlemmer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Ja, rydd ut objektet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Bekreft Remote Control handlinger" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zoom ut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Flytt valgt medlem ned" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Utfør endringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Enkel" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Brukt av" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "koblet" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Flytt opp" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Flytt valgte medlem opp" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Legg til utvalgte" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Tilføy alle valgte objekt som medlemmer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Fjern Utvalg" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Fjern alle valgte objekt fra relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Sorter" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Sorter valgte relasjonsmedlemmer eller hele listen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Flytt ned" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Flytt valgt medlem ned" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Last ned medlemmer" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relasjons-editor: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Det oppstod {0} konflikter under import." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Skap ny relasjon i lag \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Rediger ny relasjon i lag \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "Rediger relasjon #{0} i lag \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Les inn utvalg" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +#, fuzzy +msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4538,5 +5294,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4546,25 +5302,22 @@ msgstr[1] "Fjern gamle egenskapsnøkler fra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Oppdaterer egenskaper på inntil {0} objekt" -msgstr[1] "Oppdaterer egenskaper på inntil {0} objekt" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bokmerker" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Tast inn først de ønskede koordinater." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Tast inn et navn for stedet." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Bytt område" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Velg først et bokmerke" @@ -4599,21 +5352,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Datakilder og typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Last ned som nytt lag" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Last ned område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4621,13 +5374,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Null pointer-feil, muligens manglende egenskaper." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Skriv inn en søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Klarte ikke lese søkeresultat om sted fra tjener" @@ -4635,5 +5388,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Gi et stednavn å søke etter:" @@ -4641,5 +5394,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4647,6 +5400,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "navn" @@ -4685,6 +5438,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4707,15 +5460,15 @@ msgstr "type" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "nær" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4724,5 +5477,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Flytbart kart" @@ -4754,5 +5507,11 @@ msgstr "Historikk for {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Lukk vinduet" @@ -5498,5 +6257,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5665,59 +6424,59 @@ msgstr "Versjon" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Bilder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Les GPX …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Ingen tid gitt for punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Ingen bilder med lesbare tidsstempler funnet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Leser {0} …" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotaggede bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS-slutt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "nåværende forskjell: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "tidssone-forskjell: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5725,138 +6484,128 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} innenfor sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synkronisér klokke" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Klarte ikke tolke datoen i fila «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Bilde" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhetens tidssone (forskjell fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke tolkes" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Tilpass linjetegning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Bruk globale indstillinger." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Tegn linjer mellem punkter i dette laget." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Tegn ikke linjer mellem punkt i dette laget." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Velg linjetegnings-innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Tilpass farge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Velg en farge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Markører fra navngitte punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Navngivne sporpunkt fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importer lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave-lydfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Lyd-markører fra {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importer bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5865,5 +6614,5 @@ msgstr[1] "{0} spor, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5872,5 +6621,5 @@ msgstr[1] "{0} ruter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5879,30 +6628,30 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Navn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Tidshorisont: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lengde: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Konverter til datalag" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5912,43 +6661,43 @@ "skadeligt
Se her for å laste inn GPS spor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Konvertert fra: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Last ned alt innenfor:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km²" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5959,9 +6708,9 @@ "Ønsker du
å fortsette?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5971,5 +6720,5 @@ "ble utelatt eller flyttet til start." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5979,47 +6728,47 @@ "utelatt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6044,5 +6793,5 @@ msgstr[1] "GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6050,5 +6799,5 @@ msgstr[1] "punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6057,5 +6806,5 @@ msgstr[1] "et GPS spor med {0} punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6064,5 +6813,5 @@ msgstr[1] "{0} består av {1} GPS spor" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6081,5 +6830,5 @@ msgstr[1] "flagg" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6088,29 +6837,29 @@ msgstr[1] "{0} består av {1} flagg" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synkroniser lyd" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Du må sætte lyden på pause når du hører synkroniserings-merket." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Lyd synkronisert i punkt {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Kan ikke synkronisere i det avspillte lag." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Sett audio-merke ved avspilnings-start" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6118,10 +6867,17 @@ msgstr "Du må pause lyden på det punkt på sporet, hvor du vil ha merket." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Ingen eksisterende lydmerker i dette lag å forskyve." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Vis/skjul tekst/ikoner" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Slå av/på visning av tekst/ikoner" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6131,5 +6887,5 @@ "(etter første markør)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6139,29 +6895,29 @@ "i track for synkronisering." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Kan ikke sette ny audio-markør" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "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:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL var: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Feil ved visning av URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Avanserte innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Endre innstillingerne direkte. Vær varsom!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6169,14 +6925,14 @@ msgstr "Søk: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Nåværende verdi er standard." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Standardverdien er «{0}»." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6184,13 +6940,13 @@ "enda)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Velg raden som skal endres" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6198,14 +6954,14 @@ msgstr "Ny verdi for {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Velg raden som skal slettes" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Gi en ny nøkkel med verdi" @@ -6340,40 +7096,40 @@ msgstr "Stemme recorder kalibrering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farge" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Tegnestil {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Lag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Velg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Velg en farge for {0}g" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Sett til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Sett alt til standard" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Farger brukt av forskellige objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Farger" @@ -6704,52 +7460,61 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 msgid "Map Paint Styles" -msgstr "" +msgstr "Map Pain stiler" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "Brukt stil" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Indstil tilgængelige programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Last ned liste" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Oppdater" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Sett opp nettsteder …" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Legg til URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Velg en verdi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Rediger URL for liste over programtillegg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Legg til URL for liste over programtillegg." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Indstilling på programtillegg sider" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Visningsinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6759,29 +7524,29 @@ "prorammet." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Innstillinger for tilkobling" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Innstillinger for forbindelse til OSM-tjeneren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Innstillinger for kart" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Innstilinger for kartprojeksjon og datafortolkning" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Lydinnstillinger" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Innstillinger for avspilling av lyd og lyd markering." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft." @@ -6887,59 +7652,61 @@ msgstr "Hurtigtast" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "Kort beskrivelse: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "Opphavsperson: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Nettside: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "Versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Velg raden du vil kopiere." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "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 msgid "Delete the selected source from the list." msgstr "Slett den valgte kilden fra lista." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7125,33 +7892,33 @@ msgstr "Kombinasjonstast grupper:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Mer informasjon om denne funksjonen" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Valgfrie attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Bruk objektmal «{0}» i gruppe «{1}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Bruk objektmal «{0}»" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "stengt_vei" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7162,15 +7929,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7180,18 +7947,18 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Endre egenskaper" @@ -7202,33 +7969,36 @@ msgstr "Objektmalgruppe «{0}»" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Kontakter OSM-tjeneren …" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Laster ned punkt {0} til {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Laster ned OSM-data …" - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, muligens fordi egenskaper mangler." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Klargjør data …" + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Klarte ikke lese «{0}»" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7236,21 +8006,21 @@ msgstr "GPX filer" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markører fra {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Fila «{0}» finnes ikke" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7267,10 +8037,29 @@ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, 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:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7280,48 +8069,47 @@ "element." -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 filer" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Importerte koordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Ugyldig koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Feil i kontrollsum: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Ukjent koding: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Koodinater med null: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA data er lest inn" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Feil ved import av NMEA data!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 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:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7331,15 +8119,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:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, 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:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, 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:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7347,34 +8135,47 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Åpner endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Forbereder …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Laster opp …" +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Scanner mappa {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Kode={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Tjeneren svarte en feil med kode {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7407,9 +8208,4 @@ msgstr "Logg inn" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Avbryter …" - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7468,43 +8264,47 @@ "leste «{1}»" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Feil ved innlesing." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM-tjenerfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Ukjent versjon" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Versjon nummer mangler i OSM data" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Ukjent versjon: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Fant element i ikke_linje." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " har zero ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Fandt -element i en ikke-relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Mangler attributt «ref» for medlem av relasjon {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" @@ -7512,23 +8312,23 @@ "Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Ufullstendig -spesifikasjon med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Ulovlig objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7537,46 +8337,66 @@ "Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Mangler attributt «version» for OSM-element med ID {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Mangler obligatorisk attributt «{0}»." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Klargjør OSM-data …" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Feil id for node" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "parameter «{0}» >= 0 forventet – leste «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Laster ned historikk …" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Kobler til tjener …" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Klarte ikke åpne tilkobling til API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7584,5 +8404,18 @@ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3}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 #, java-format msgid "" @@ -7591,16 +8424,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Opdater programtillegg" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Last ned Programtillegg" @@ -7617,5 +8445,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7624,23 +8452,23 @@ msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Laster ned programtillegg {0} …" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Hopp over nedlasting" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM versjon {0} er nødvendig for programtillegg {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Last ned programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Hopp over nedlasting" @@ -7651,19 +8479,17 @@ msgstr "Det oppsto feil i programtillegget {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Advarsel – programtillegget {0} skulle lastes inn, men det er ikke lenger " "behov for det." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -7671,15 +8497,15 @@ "Programtillegget {1} er avhengig av programtillegg {0} men ble ikke funnet." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Fant ikke programtillegget: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Siste oppdaterte programtillegg for {0} dager siden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7689,21 +8515,21 @@ "oppstettet 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Fjern programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Behold programtillegg" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7713,5 +8539,5 @@ "skrive over eksisterende." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7719,10 +8545,10 @@ msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7730,9 +8556,9 @@ "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Skal programtillegget fjernes?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7742,26 +8568,23 @@ "lese programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM utviklerne." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informasjon" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Fant ikke info om programtillegg." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "ingen beskrivelse tilgjengelig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Flere detaljer" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7770,13 +8593,18 @@ msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Fant ikke info om programtillegg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Alle installerte programtillegg er siste versjon." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7789,9 +8617,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Last ned programtillegg som mangler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7804,57 +8632,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "ukjent" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versjon {1} {2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Programtillegg inkludert i JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Feil oppsto ved lesing av info om programtillegg: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Dette er etter avsluttingen av opptaket" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Feil med avspilling av lyd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ikke gjør noe" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Rapporter feil" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7868,14 +8674,14 @@ "versjon av JOSM, setter vi pris på en feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "En uventet unntakstilstand" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Venligst send en feilrapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7884,5 +8690,5 @@ "Vær detaljert. Bruk engelsk." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7892,17 +8698,33 @@ "sender feilrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Husk å inkludere følgende informasjon:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Ikke vis igjen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7915,5 +8737,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7923,5 +8745,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7932,13 +8754,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Hint: Du kan endre hurtigtastene i Innstillinger.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Lag et Rutenett av linjer" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7948,21 +8785,21 @@ "noder unntatt en felles" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Velg to linjer med en felles node" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Velg to linjer med kun én felles node" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Lag rutenett med linjer" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Last opp sporlogg" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7970,9 +8807,9 @@ msgstr "Last opp sporlogger" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Offentlig" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" @@ -7981,65 +8818,66 @@ #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Beskrivelse" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Oppgi en beskrivelse av sporloggen." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Oppgi egenskaper til sporet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Valgt spor: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Kobler til …" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Opplastingen ble avsluttet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Feil under opplastingen" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX opplastingen var vellykket" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Klarte ikke laste opp. Tjeneren gav følgende svar: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Laster opp GPX spor: {0}% ({1} av {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Ingen beskrivelse er gitt. Legg inn beskrivelse av sporet" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPX lag er ikke valgt -> Ingen spor å laste opp." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Ingen Brukernavn er oppgitt." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Det er ikke oppgitt passord." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPX Spor lastes opp" @@ -8109,33 +8947,34 @@ msgstr "En av de valgte filene var null (tom)!!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Les bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Klarte ikke å lage fullstendig sti til mappa {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Scanner mappa {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Fant tom fil i mappa {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Feil ved lesing av fil i mappa {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Juster til GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8155,15 +8994,15 @@ msgstr "GPX Filer (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Fila {0} er lastet inn under navnet «{1}»" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Feil oppsto ved sending av {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8174,34 +9013,34 @@ "
Skriv inn tidspunktet og velg tidssone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Tidspunkt for foto (fra EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps tidspunkt (lest i bildet ovenfor): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Jeg er i tidssonen: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Ingen dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Åpne et annet foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8211,70 +9050,70 @@ "Sjekk format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Ugyldig dato" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX-spor: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Åpne flere GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Tidssone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Forskyvning:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Jeg kan fotogragere min GPS mottaker.
Kan det være til hjelp?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Opdater posisjon for: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Alle bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Bilder uden EXIF-posisjon" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Bilder uten egenskaper" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Jevnfør bilder med GPX spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Jevnfør" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Automatisk forslag" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Du bør velge et GPX-spor" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Intgen GPX-spor er valgt" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8285,9 +9124,9 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Ugyldig tidssone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8298,65 +9137,65 @@ "Forventet format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Ugyldig forskyvning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Fant {0} treff av {1} i GPX spor {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX-spor er lagt inn" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Valgte foto har ikke tidskode." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Foto har ikke tidskode." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX sporet har ikke tidskoder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Tidssone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minutter: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Koplet {0} av {1} foto til GPX spor." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Tidsforskjell på {0} dager)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Forskyvning mellom spor og foto: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8366,13 +9205,13 @@ "synkronisere bildene manuelt." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Klarte ikke å koble foto til sporet" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Juster tidssone og forskyvning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Standardverdier" @@ -8394,5 +9233,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Feil ved lasting av fil" @@ -8415,6 +9254,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "Feil URL for lesing av Matrikkel." @@ -8597,22 +9436,22 @@ msgstr "Legg inn kilde ( source=...) på element?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Laster ned {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Kobler til WMS-tjener …" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Lag bygninger" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8622,18 +9461,18 @@ "bygningsimport er maks 1 km2." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Vennligst aktiviser \"auto-sourcing\" og sjekk Cadastre millesime." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Hent ut SVG-ViewBox …" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Hent ut beste avgrensing …" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Lag avgrensing" @@ -8750,6 +9589,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Blankt lag" @@ -8778,5 +9617,5 @@ msgstr "Kommune avgrensing: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8787,9 +9626,9 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Feil i mellomlager format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -8797,5 +9636,5 @@ "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Feil Lambert sone på mellomlager" @@ -8837,9 +9676,9 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Split area" -msgstr "" +msgstr "Del område" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "" +msgstr "Deler et område med en umerket veg." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -8868,5 +9707,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "TCX filer (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8883,4 +9722,9 @@ msgstr "Kan ikke fordoble usortert linje." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Ingen data lastet inn." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8891,9 +9735,9 @@ msgstr "Opprett kopi av linje" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Lag for redigering av GPX-spor" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Konverter til GPX lag med anonymisert tid" @@ -9014,30 +9858,30 @@ msgstr "slett data etter import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importerer data fra enhet" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importerer data fra DG100 …" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Feil ved sletting av data." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "importerte data fra {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Fant ikke data på enhet." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Tilkobling mislykkes" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9049,14 +9893,14 @@ "import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat-import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Import Data fra Globalsat Datalogger DG100 til GPX lag." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importer" @@ -9147,40 +9991,40 @@ msgstr "Åpne bilder med ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Retningsindex '{0}' ble ikke funnet" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Startposisjon var ikke innenfor avgrensingen" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Søker etter kystlinje …" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} noder til nå …" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Feil ved oppretting av mappe for mellomlager: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Tegne" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "sjekker mellomlager …" @@ -9189,26 +10033,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Reduserer antall punkter …" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Kjører Douglas-Peucker-tilnærming …" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Fjerner doble noder …" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker tegning" @@ -9293,7 +10129,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "vann" @@ -9448,9 +10284,9 @@ msgstr "Innstillinger for Lakewalker tilleggsprogram" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Laster ned bildefil …" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kunne ikke hente bilde" @@ -9699,18 +10535,18 @@ msgstr "Ukendt status for feilrapport" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Åpne synlige …" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Åpne filer som er synlige i det nåværende synsfelt." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Ingen arbeidsområde åpnet – kan ikke finne avgrensing." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9736,33 +10572,33 @@ msgstr "Firefox-programfil" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "last inn data fra API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "bytt utvalg" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "bytt arbeidsutsnitt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "Bekreft alle Remote control handlinger manuelt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Remote Control" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Remote Control tilleggsprogram innstillinger." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9774,28 +10610,28 @@ "fjernstyring av tilleggsprogrammet." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Tillatte handlinger" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Remote Control er bedt om å laste data fra API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Be om detaljer: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Vil du tillate dette?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Bekreft Remote Control handlinger" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Remote Control har bedt om data fra denne URL:" @@ -9804,13 +10640,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Rediger relasjon" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Rediger relasjoner" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Ingen relasjoner er valgt" #. Add menu @@ -9924,5 +10760,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "bilde " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9969,5 +10805,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -10060,4 +10896,25 @@ msgid "Highlight" msgstr "Fremhev" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Oppdaterer egenskaper på inntil {0} objekt" +msgstr[1] "Oppdaterer egenskaper på inntil {0} objekt" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10312,33 +11169,33 @@ msgstr "Åpner dialog som lar deg gå til bestemt posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 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:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 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:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (i meter)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Gå dit" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Gå til posisjon" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Kunne ikke tolke Lat / Lon" @@ -10370,6 +11227,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Valideringsfeil" @@ -10379,10 +11236,10 @@ msgstr "Ingen valideringsfeil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Rutenett" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10473,23 +11330,15 @@ msgstr "Kjører datavalidering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Data med feil. Last opp uansett?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Åpne valideringsvindu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zoom til problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Valider" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Valider enten aktivt utvalg eller hele datasett." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10562,22 +11411,22 @@ msgstr "Kryssende veier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Dobbelt-Noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Doble linjenoder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Sjekker om linjer har identiske etterfølgende Noder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Doble linjenoder" @@ -10652,23 +11501,23 @@ msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Egenskapskontroll" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ugyldig stavekontroll linje: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10679,7 +11528,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Ulovlige kombinasjoner Egenskap / Verdi" @@ -10687,78 +11536,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problem med visning" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nøkkel «{0}» er ugyldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Egenskaper uten verdier" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Ulovlig egenskapsnøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Ulovlig mellomrom i Nøkkel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Egenskap Verdi starter eller slutter med mellomrom" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Egenskap Verdi inneholder HTML koding" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Nøkkel «{0}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Objektmalene inneholder ikke Nøkkelen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Objektmalen har ikke Egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Sjekk egenskabsnøkler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Bruk avansert egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Egenskapskontroll-kilde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10768,82 +11619,82 @@ "org/index.php/User:JLS/speller) eller \"tag checking data files\"." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Tilføy en ny kilde til lista." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Rediger valgt kilde." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Datakilder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Sjekk egenskapsverdier." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Se etter FIXMEs" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Finn notater om tegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Sjekk etter feil ved opptegning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Bruk standard datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Bruk standard datafil (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Bruk standard fil for stavekontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Brug standard fil for stavekontroll (anbefales)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Korriger egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Kunne ikke finne element-typen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Kunne ikke finne advarsels-niveå" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ugyldig uttrykk «{0}»" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10988,7 +11839,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "bygning" @@ -11002,5 +11853,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "område" @@ -11034,10 +11885,10 @@ msgstr "Knyttet endenode nær annen linje" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Noder uten egenskaper eller tilknytninger" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje." @@ -11057,5 +11908,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Kryss uten navn" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -11091,8 +11942,32 @@ msgstr "Feil retning på Landlinje: Land er ikke på venstre side" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, …" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11103,10 +11978,10 @@ msgstr "Velg en startnode i enden av en linje" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Nådde slutten av linja" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Nådde et kryss" @@ -11178,14 +12053,14 @@ msgstr "Hjelp WMS tilleggsprogram" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Ortografisk korrekt bilde …" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11196,26 +12071,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Selvvalgt WMS-adresse" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Gå til hjemmeside" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS-URL eller bilde-ID:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11223,5 +12098,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Ingen gyldig WMS-URL eller ID" @@ -11231,5 +12106,5 @@ msgstr "Tilpass posisjon på valgt WMS lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11240,107 +12115,107 @@ "Dette resulterer i feil koordinater." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatisk nedlasting" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS lag ({0}) laster ned i zoom {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" 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:231 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 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:274 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Åpne tomt WMS lag til data fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Innstillinger WMS Programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Meny Navn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Meny Navn (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (Standard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Gi meny navn og WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Kopier Standard" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Nedlaster:" @@ -11399,5 +12274,5 @@ #: build/trans_plugins.java:5 msgid "A special handler for the French land registry WMS server." -msgstr "" +msgstr "En spesiell håntering for det franske landregisterets WMS tjener" #. Plugin colorscheme @@ -11424,5 +12299,5 @@ msgid "" "Creating and handling address nodes and buildings within Czech Republic." -msgstr "" +msgstr "Lag og håntere addressenoder og bygninger i den Tsjekkiske Republikk" #. Plugin dataimport @@ -11458,11 +12333,16 @@ msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Bakgrunnslag som viser rutenettet i kartet" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11475,10 +12355,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "For vektorisering av WMS bilder." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11488,5 +12368,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11499,5 +12379,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11510,15 +12390,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Viser bakgrunnsbildet i et åpent lag" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer tema fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11526,5 +12406,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11532,5 +12412,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11541,27 +12421,29 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "La andre program sende kommandoer til JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " "defined in routes.xml file in plugin directory" msgstr "" +"Rendrer ruter (buss, stier, sykkelstier, ...). Rutetype må være definert i " +"routes.xml filen i pluginkatalogen" #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Gir deg Ruteplanlegger på OSM data." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11572,15 +12454,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Legger inn markører eller Noder på gps posisjon." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Dialog for å redigere egenskaper i en tabell." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11593,10 +12475,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Lager rekkehus / terassehus fra en enkel husblokk." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11607,5 +12489,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11616,5 +12498,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11624,11 +12506,18 @@ "vanlige. Stavekontroll for egenskapsnavn." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier." #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12783,58 +13672,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12848,6 +13685,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorway" @@ -12873,6 +13710,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "trunk" @@ -12898,6 +13735,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "riksvei" @@ -12923,6 +13760,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "fylkesvei" @@ -12936,5 +13773,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "kommunevei" @@ -12952,5 +13789,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "boligvei" @@ -12984,6 +13821,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "adkomstvei" @@ -13010,6 +13847,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "veiarbeid" @@ -13033,5 +13870,5 @@ #: build/trans_presets.java:390 msgid "Ways" -msgstr "Veier" +msgstr "Gater" #. group "Ways" @@ -13059,5 +13896,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rundkjøring" @@ -14036,5 +14873,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "Myrområde" @@ -14753,5 +15590,5 @@ #: build/trans_presets.java:2357 msgid "Shelter" -msgstr "Ly for natten" +msgstr "Leskur / Ly for natten" #. item "Public Transport/Bus Stop" check "Shelter" @@ -15765,27 +16602,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18624,7 +19461,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "sykkel" @@ -18694,7 +19531,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "fotgjenger" @@ -18720,5 +19557,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "T-bane" @@ -19209,13 +20046,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "uønsket" @@ -19257,5 +20094,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "hest" @@ -19475,4 +20312,66 @@ msgstr "hinder" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Motorsykkel" + #. color tertiary #. @@ -19507,6 +20406,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "gate" @@ -19562,7 +20461,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "ferdselsvei – traktorvei" @@ -19618,8 +20517,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "jernbane" @@ -19640,5 +20539,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "service" @@ -19652,5 +20551,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "vadested" @@ -19671,5 +20570,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "vendesirkel" @@ -19684,5 +20583,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "redningsmøtepunkt" @@ -19697,5 +20596,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "elvebredd" @@ -19709,5 +20608,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "bekk" @@ -19721,5 +20620,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "tørrdokk" @@ -19747,5 +20646,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akvadukt" @@ -19913,13 +20812,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "menneskeskapt" @@ -19981,7 +20880,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "jernbanepunkt" @@ -20004,10 +20903,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "annen bane" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "jernbanebro" @@ -20043,7 +20942,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "nedlagt bane" @@ -20088,6 +20987,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "aeroway" @@ -20101,5 +21000,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "stasjon" @@ -20121,5 +21020,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "aeroway_dark" @@ -20133,5 +21032,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "aeroway_light" @@ -20179,7 +21078,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "aerialway" @@ -20196,5 +21095,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "nedfart enkel" @@ -20209,5 +21108,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "nedfart middels" @@ -20222,5 +21121,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "nedfart avansert" @@ -20235,5 +21134,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "nedfart ekspert" @@ -20248,5 +21147,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "nedfart friløp" @@ -20261,5 +21160,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "nedfart nybegynner" @@ -20364,10 +21263,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "kraft" @@ -20381,5 +21280,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "brygge" @@ -20393,5 +21292,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "rørgate" @@ -20519,12 +21418,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "fritid" @@ -20538,5 +21437,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20608,8 +21507,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "fasilitet" @@ -20711,10 +21610,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "fasilitet – trafikk" @@ -21100,22 +21999,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "fasilitet – lys" @@ -21147,6 +22046,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "light_vann" @@ -21207,8 +22106,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "helse" @@ -21561,26 +22460,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "butikk" @@ -21652,8 +22551,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotell" @@ -21803,9 +22702,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turisme" @@ -21877,8 +22776,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historisk" @@ -21949,8 +22848,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "grønn" @@ -21964,5 +22863,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "steinbrudd" @@ -21976,5 +22875,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "avfallsdeponi" @@ -21996,5 +22895,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "vannmagasin" @@ -22008,5 +22907,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "skog" @@ -22020,5 +22919,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "gårdstun" @@ -22041,5 +22940,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "butikker" @@ -22053,5 +22952,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industri" @@ -22065,5 +22964,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "rivningsområde" @@ -22077,5 +22976,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "byggeområde" @@ -22089,5 +22988,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "jernbanegrunn" @@ -22144,7 +23043,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "millitært" @@ -22158,5 +23057,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "gravlund" @@ -22169,5 +23068,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "fjelltopp" @@ -22182,5 +23081,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "isbre" @@ -22194,5 +23093,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulkan" @@ -22247,8 +23146,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "natur" @@ -22262,5 +23161,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "krattskog" @@ -22274,5 +23173,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "beiteområde" @@ -22286,5 +23185,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "skogsområde" @@ -22298,5 +23197,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "søle" @@ -22310,5 +23209,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "strand" @@ -22386,8 +23285,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "rute" @@ -22435,7 +23334,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "grense" @@ -22577,10 +23476,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "sted" @@ -22628,6 +23527,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adresse" @@ -22777,5 +23676,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Ikke navngitt uklassifisert veg" #. way : W : highway == unclassified && name != * @@ -22888,5 +23787,5 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? @@ -22924,24 +23823,109 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Datalag" - -#~ msgid "Uploading data" -#~ msgstr "Laster opp data" - -#~ msgid "Not implemented yet." -#~ msgstr "Ikke implementert enda." +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Klarte ikke starte API. Prøv igjen senere." + +#~ msgid "API initialization failed" +#~ msgstr "Klarte ikke starte API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?" + +#~ msgid "No data" +#~ msgstr "Ingen data" + +#~ msgid "Update failed" +#~ msgstr "Oppdatering feilet" + +#~ msgid "Missing primitive" +#~ msgstr "Mangler objekt" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Bruk ufullstendige løsninger" + +#~ msgid "Layers: {0}" +#~ msgstr "Lag: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM " +#~ "utviklerne." + +#~ msgid "Validate" +#~ msgstr "Valider" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Valider enten aktivt utvalg eller hele datasett." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Noen av nodene er (nesten) på linje" #~ msgid "Email" #~ msgstr "E-post" -#~ msgid "Resolve Conflicts" -#~ msgstr "Løs Konflikter" - -#~ msgid "There were conflicts during import." -#~ msgstr "Det var konflikter ved import." - -#~ msgid "Object" -#~ msgstr "Objekt" +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "Hjelp mangler. Kan lages i english." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Hjelp mangler. Kan lages i english ellerr norsk bokmål." + +#~ msgid "unnamed" +#~ msgstr "uten navn" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "Yahoo (GNOME)" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Følgende feil oppsto under nedlasting:" + +#~ msgid "Change" +#~ msgstr "Endre" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "{0} konflikter må løses i {1} objecter" + +#~ msgid "Rotate" +#~ msgstr "Roter" + +#~ msgid "different" +#~ msgstr "forskjellig" + +#~ msgid "position" +#~ msgstr "posisjon" + +#~ msgid "false" +#~ msgstr "usann" + +#~ msgid "true" +#~ msgstr "sann" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326 (lengde- og breddegrad)" + +#~ msgid "their version:" +#~ msgstr "annen versjon:" + +#~ msgid "resolved version:" +#~ msgstr "rett versjon" #~ msgid "{0} object has conflicts:" @@ -22953,36 +23937,9 @@ #~ msgstr "min versjon:" -#~ msgid "their version:" -#~ msgstr "annen versjon:" - -#~ msgid "resolved version:" -#~ msgstr "rett versjon" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM brukernavn (e-postadressen)" - -#~ msgid "Unknown host" -#~ msgstr "Ukjent vert" - -#~ msgid "position" -#~ msgstr "posisjon" - -#~ msgid "different" -#~ msgstr "forskjellig" - -#~ msgid "true" -#~ msgstr "sann" - -#~ msgid "false" -#~ msgstr "usann" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "{0} konflikter må løses i {1} objecter" - -#~ msgid "Change" -#~ msgstr "Endre" +#~ msgid "Resolve Conflicts" +#~ msgstr "Løs Konflikter" + +#~ msgid "Object" +#~ msgstr "Objekt" #~ msgid "Click Reload to refresh list" @@ -22991,7 +23948,4 @@ #~ msgid "Revert" #~ msgstr "Tilbakestill" - -#~ msgid "Date" -#~ msgstr "Dato" #~ msgid "" @@ -23002,48 +23956,42 @@ #~ "historikk." -#~ msgid "Rotate" -#~ msgstr "Roter" +#~ msgid "Date" +#~ msgstr "Dato" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikter: {0}" + +#~ msgid "Not implemented yet." +#~ msgstr "Ikke implementert enda." #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Egenskaper (tom verdi fjerner egenskap)" -#~ msgid "Error parsing server response." -#~ msgstr "Klarte ikke lese tjenerrespons." - -#~ msgid "Cannot connect to server." -#~ msgstr "Klarte ikke koble til tjeneren." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." - -#~ msgid "Tagging preset source" -#~ msgstr "Innstilling av Objektmaler" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Legg til ny Objektmal instilling i lista." - -#~ msgid "Tagging preset sources" -#~ msgstr "Kilder for objektmaler" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du " -#~ "prøver på nytt." - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Programtillegg oppdatert. Restart JOSM." -#~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" - -#~ msgid "image not loaded" -#~ msgstr "Bilde er ikke lest inn" +#~ msgid "Occupied By" +#~ msgstr "Brukt av" + +#~ msgid "Remove Selected" +#~ msgstr "Fjern Utvalg" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Tilføy alle valgte objekt som medlemmer" + +#~ msgid "Basic" +#~ msgstr "Enkel" + +#~ msgid "Add Selected" +#~ msgstr "Legg til utvalgte" + +#~ msgid "Move Up" +#~ msgstr "Flytt opp" + +#~ msgid "There were conflicts during import." +#~ msgstr "Det var konflikter ved import." + +#~ msgid "Move Down" +#~ msgstr "Flytt ned" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relasjons-editor: {0}" #~ msgid "" @@ -23054,48 +24002,15 @@ #~ "flytt musa. Velg: Klik" -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier bilde id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Juster posisjon til WMS laget" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326 (lengde- og breddegrad)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "Yahoo (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "Yahoo (GNOME-fiks)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "Yahoo (WebKit)" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Programtillegget krever oppdatering {0} av JOSM." - -#~ msgid "Plugin already exists" -#~ msgstr "Programtillegg finnes allerede" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Feil ved sletting av programtillegg: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Noen av nodene er (nesten) på linje" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "Yahoo (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Import TCX File..." -#~ msgstr "Importer TCX-fil …" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importer TCX fil som GPS spor" +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM brukernavn (e-postadressen)" #~ msgid "" @@ -23109,14 +24024,93 @@ #~ "andre kan lese det." +#~ msgid "Delete and Download" +#~ msgstr "Slett og last ned" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Legg til ny Objektmal instilling i lista." + +#~ msgid "Tagging preset source" +#~ msgstr "Innstilling av Objektmaler" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Finner ikke tallverdi i svaret" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Opplasting av data feilet av ukjent grunn" + #~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." #~ msgstr "" -#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" -#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du " +#~ "prøver på nytt." + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Programtillegg oppdatert. Restart JOSM." +#~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM." + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." #~ msgstr "" -#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" +#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " +#~ "automatisk." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Programtillegget krever oppdatering {0} av JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" + +#~ msgid "Plugin already exists" +#~ msgstr "Programtillegg finnes allerede" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " +#~ "versjon over den eksisterende?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Feil ved sletting av programtillegg: {0}" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " +#~ "kobling." + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Juster posisjon til WMS laget" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" + +#~ msgid "image not loaded" +#~ msgstr "Bilde er ikke lest inn" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importer TCX fil som GPS spor" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført." + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier bilde id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" #~ msgid "" @@ -23167,10 +24161,87 @@ #~ "tvil: la være å bruke bildet." +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS" + #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." +#~ "The main feature of the plugin is the possibility to delete points of the " +#~ "GPX track. This plugin can be used to prepare tracks for uploading to " +#~ "OSM eg. deleting uninteresting parts of track." #~ msgstr "" -#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned " -#~ "automatisk." +#~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " +#~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor " +#~ "(fjerne uinteressante punkt) før opplasting til OSM." + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Last inn TCX filer direkte fra JOSM." + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har " +#~ "historikk.." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." + +#~ msgid "linked" +#~ msgstr "koblet" + +#~ msgid "Overlap tiles" +#~ msgstr "Overlapp kartbilder" + +#~ msgid "% of lat:" +#~ msgstr "% av bredden:" + +#~ msgid "% of lon:" +#~ msgstr "% av lengden:" + +#~ msgid "Data Layer" +#~ msgstr "Datalag" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontakter OSM-tjeneren …" + +#~ msgid "image loading..." +#~ msgstr "laster bilde …" + +#~ msgid "Aborting..." +#~ msgstr "Avbryter …" + +#~ msgid "Import TCX File..." +#~ msgstr "Importer TCX-fil …" + +#~ msgid "Error parsing server response." +#~ msgstr "Klarte ikke lese tjenerrespons." + +#~ msgid "Cannot connect to server." +#~ msgstr "Klarte ikke koble til tjeneren." + +#~ msgid "Error when communicating with server." +#~ msgstr "Klarte ikke kommunisere med tjener." + +#~ msgid "Tagging preset sources" +#~ msgstr "Kilder for objektmaler" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://" +#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp." + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "Yahoo (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "Yahoo (GNOME-fiks)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "Yahoo (WebKit GTK)" #~ msgid "" @@ -23186,79 +24257,4 @@ #~ "en fransk WMS-tjener.\n" #~ "Ikke last opp data etter denne beskjeden." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Programtillegg lista er allerede tilgengelig. Vil du laste ned ny " -#~ "versjon over den eksisterende?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikter: {0}" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambert sone {0} i mellomlager stemmer ikke med aktiv Lambert sone {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Slett og last ned" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført." - -#~ msgid "Solve Conflict" -#~ msgstr "Løs Konflikt" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har " -#~ "historikk.." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell " -#~ "kobling." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Følgende feil oppsto under nedlasting:" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "Hjelp mangler. Kan lages i english." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Hjelp mangler. Kan lages i english ellerr norsk bokmål." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Last inn TCX filer direkte fra JOSM." - -#~ msgid "" -#~ "The main feature of the plugin is the possibility to delete points of the " -#~ "GPX track. This plugin can be used to prepare tracks for uploading to " -#~ "OSM eg. deleting uninteresting parts of track." -#~ msgstr "" -#~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. " -#~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor " -#~ "(fjerne uinteressante punkt) før opplasting til OSM." #~ msgid "" @@ -23277,25 +24273,10 @@ #~ "Ikke last opp data etter denne meldingen." -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Finner ikke tallverdi i svaret" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Opplasting av data feilet av ukjent grunn" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." - -#~ msgid "Overlap tiles" -#~ msgstr "Overlapp kartbilder" - -#~ msgid "% of lat:" -#~ msgstr "% av bredden:" - -#~ msgid "% of lon:" -#~ msgstr "% av lengden:" - -#~ msgid "Error when communicating with server." -#~ msgstr "Klarte ikke kommunisere med tjener." - -#~ msgid "image loading..." -#~ msgstr "laster bilde …" +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Lag {0} må være i listen over lag" + +#~ msgid "Sort" +#~ msgstr "Sorter" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Sorter valgte relasjonsmedlemmer eller hele listen." Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 16826) +++ /applications/editors/josm/i18n/po/nl.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-14 08:28+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-28 07:35+0000\n" "Last-Translator: Valentijn Sessink \n" "Language-Team: Dutch \n" @@ -16,26 +16,103 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:25+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Hoofdscherm aanmaken" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Fout" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -43,57 +120,60 @@ "naar de server." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Niet-opgeslagen wijzigingen" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "" "Wijzigingen zijn niet opgeslagen. Deze veranderingen negeren en verder gaan?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Sla op en verlaat JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Negeer veranderingen en verlaat JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -102,32 +182,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Annuleren" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ongeldige URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Waarschuwing" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ongeldige bestands-URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "ONBEKEND" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Over" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Het informatiescherm tonen." @@ -135,10 +275,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -146,5 +286,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -153,19 +293,19 @@ msgstr "Versie {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Laatste verandering op {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java-versie {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Beginpagina" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Probleem melden" @@ -175,37 +315,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Informatie" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Leesmij" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revisie" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Bijdrage" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Plugins" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Over JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Bestand kon niet gevonden worden." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -214,16 +358,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Waarschuwing" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -232,7 +369,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Selecteer een rij om te verwijderen." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Selecteer één van beide:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Knopen samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Knoop toevoegen..." @@ -244,14 +409,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -259,57 +426,57 @@ msgstr "Bewerk: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Coördinaten van de nieuwe knoop invoeren." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Decimale graden gebruiken." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Breedtegraad" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Lengtegraad" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Knopen uitlijnen in een cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "De geselecteerde knopen in een cirkel plaatsen." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -325,25 +492,58 @@ msgstr "Gereedschap: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Selecteer minstens vier knopen." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Knopen uitlijnen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "De geselecteerde knopen op een lijn plaatsen" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Selecteer minstens drie knopen:" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -351,19 +551,13 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +"Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is " +"{1}" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -372,5 +566,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -378,47 +572,49 @@ "length {2}. Values length is {3}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +"Lengte van de waarde voor label \"{0}\" van onderdeel {1} overschrijdt de " +"maximumwaarde {2}. De lengte is nu {3}." + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "gegevens" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "Laag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selectie" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Inzoomen op {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Beeld inzoomen op {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -428,30 +624,30 @@ msgstr "Beeld: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Geen selectie om op in te zoomen." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Selecteer twee of meer wegen om te combineren." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Wegen combineren ondanks verschillende relaties?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -461,13 +657,13 @@ "u zeker dat u ze wilt combineren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Toch combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Richting omkeren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -477,10 +673,10 @@ "de richting van enkele omkeren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Omkeren en combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -488,20 +684,20 @@ msgstr "Waarden voor alle conflicten invoeren." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "{0} wegen combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Alle wegen zijn leeg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -520,111 +716,149 @@ msgstr "Geselecteerde objecten naar klembord kopiëren" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Selecteer iets om te kopiëren" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Cirkel aanmaken" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Een cirkel uit drie knopen maken." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Deze knopen staan niet in een cirkel." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Selecteer precies twee of drie knopen; of een weg met precies twee of drie " +"knopen." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Verwijderen" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Geselecteerde objecten verwijderen." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Overschrijven?" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Knopen verdelen" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Kaart downloaden van de OSM-server." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Bestand: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Downloaden" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Selecteer tenminste één taak om te downloaden" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Er waren {0} tegenstrijdigheden tijdens het importeren." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Fouten tijdens download" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Dupliceren" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Dupliceer selectie door kopiëren en direct plakken." @@ -644,5 +878,5 @@ msgstr "De applicatie afsluiten." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -652,58 +886,73 @@ "met een GPL-licentie." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exporteren naar GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "De gegevens naar een GPX-bestand exporteren." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Geen gegevens om te exporteren, maak deze eerst." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "Parameter \"{0}\" mag niet leeg zijn." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "GPS-trackomschrijving" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Voeg auteursinformatie toe" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Echte naam" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +msgstr "E-mail" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Voorgedefinieerd" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Jaar van copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Trefwoorden" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Exporteeropties" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exporteren en opslaan" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -714,25 +963,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Fout" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Kies een voorgedefineerde licentie" @@ -742,46 +971,49 @@ msgstr "JOSM Online-hulp" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Openen in browser" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Bewerken" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Herladen" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Fout tijdens het laden van {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -797,14 +1029,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Toon geschiedenis van OSM wegen, knopen of relaties." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Info over element" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Toon objectinformatie over OSM wegen, knopen of relaties." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -817,30 +1049,40 @@ msgstr "Koppel een knoop met het dichtstbijzijnde wegsegment" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Knoop en lijn koppelen" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Geen sneltoets" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Toch samenvoegen" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -850,9 +1092,9 @@ "samenvoegen?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Toch samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -860,60 +1102,71 @@ "in gebruik is." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "{0} knopen samenvoegen" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selectie" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "De geselecteerde leden omlaag verplaatsen" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Spiegelen" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Spiegel de geselecteerde knopen en wegen." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Selecteer ten minste één knoop of weg." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "omhoog" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Objecten {0} verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "omlaag" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "links" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "rechts" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "{0} verplaatsen" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Verplaatst objecten {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan objecten niet buiten de wereld plaatsen." @@ -921,5 +1174,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nieuw" @@ -929,26 +1182,17 @@ msgstr "Een nieuwe kaart aanmaken." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "Onbenoemd" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Openen..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Een bestand openen." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kan \"{0}\" niet lezen" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -977,34 +1221,35 @@ msgstr "Download-URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Vorm orthogonaal maken" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Slechts twee knopen toegestaan" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Selectie mag slechts wegen bevatten." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Je gebruikt projectie EPSG:4326 die kan leiden tot
ongewenste " @@ -1012,9 +1257,9 @@ "waarschuwing te verwijderen.
Wil je verder gaan?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Slechts één knoop geselecteerd" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Orthogonaal maken" @@ -1030,11 +1275,11 @@ msgstr "Inhoud van het buffer plakken." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Tags plakken" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items." @@ -1062,16 +1307,21 @@ msgstr "De laatste ongedaan gemaakte opdracht herstellen." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Laag hernoemen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Ook het bestand hernoemen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Kan het bestand \"{0}\" niet hernoemen." @@ -1085,9 +1335,9 @@ msgstr "De richting van alle geselecteerde wegen omkeren." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Selecteer minstens één weg." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Wegen omkeren" @@ -1095,17 +1345,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Opslaan" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Huidige gegevens opslaan." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Het bestand {0} bestaat al. Overschrijven?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1115,25 +1367,25 @@ "dit als fout a.u.b." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Geen document geopend, dus ook niets om op te slaan." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Leeg document" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Het document bevat geen gegevens." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Toch opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflicten" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1143,54 +1395,75 @@ "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Conflicten verwerpen en opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "OSM-bestand opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "GPX-bestand opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Laag opslaan" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Kan van bestand geen backup maken." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Onbekende bestandsextentie: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Het opslaan is mislukt." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Het herstellen van backupbestand is mislukt." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Onbekende bestandsextentie." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Het opslaan is mislukt." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Het herstellen van backupbestand is mislukt." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Opslaan als..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "De huidige gegevens in een nieuw bestand opslaan." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Alles selecteren" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1224,16 +1497,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Sluiten" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Weg splitsen" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Een weg bij de geselecteerde knoop splitsen." @@ -1243,5 +1516,5 @@ msgstr "De huidige selectie kan niet gebruik worden voor splitsen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1249,5 +1522,5 @@ msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1263,9 +1536,9 @@ "heeft, Selecteer ook de weg." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1273,11 +1546,11 @@ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1287,8 +1560,9 @@ "selecteer knopen in het midden van de weg.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Een lidmaatschapsrelatie gebaseerd op een rol is gekopieerd naar alle nieuwe " @@ -1296,11 +1570,14 @@ "Je moet dit controleren en waar nodig corrigeren." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Een relatielidmaatschap is naar alle wegen gekopieerd.\n" +"Verifieer dit, en maak aanpassingen als dat nodig is." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1321,47 +1598,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Selecteer één van beide:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Een getagde knoop, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* een knoop die gebruikt is door meer dan een weg, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1370,5 +1647,5 @@ "weg, of" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1377,5 +1654,5 @@ "één weg." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1389,9 +1666,9 @@ "geselecteerd worden." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Ongebonden knoop" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1399,5 +1676,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1413,29 +1690,29 @@ msgstr "De laatste opdracht opgedaan maken." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Alles deselecteren" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Alle objecten deselecteren." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Alles deselecteren (focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Alles (escape) deselecteren" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Gegevens bijwerken" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" @@ -1443,113 +1720,62 @@ "gegevens)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend of " -"gedownload?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Geen GPX-gegevenslaag gevonden." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +msgstr "Selectie leeg" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Naar OSM uploaden..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Upload alle aanpassingen naar de OSM-server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Objecten om toe te voegen:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Objecten om te bewerken:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Objecten om aan te verwijderen:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Deze veranderingen uploaden?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Aanpassingen uploaden" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Geen aanpassingen aanwezig om te uploaden." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +msgstr "Synchroniseer alleen {0} {1}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +msgstr "Synchroniseer alle gegevens" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1563,17 +1789,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" -msgstr "" +msgstr "Tegenstrijdigheid ontdekt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1584,53 +1810,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Upload alle aanpassingen naar de OSM-server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Objecten om toe te voegen:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Objecten om te bewerken:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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 "" @@ -1719,42 +1956,54 @@ msgstr "Langzaam vooruit" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "GPS-gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Gedownloade GPX-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Rauwe GPS-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Gegevens worden gedownload" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Geen gegevens geïmporteerd." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap-gegevens" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Download {0} van {1} ({2} te gaan)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Gegevens uploaden" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Tijdens bulkdownload traden de volgende fouten op:" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Fouten tijdens download" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1766,21 +2015,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Verwijdermodus" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Knopen of wegen verwijderen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1788,5 +2037,5 @@ msgstr "Modus: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1796,760 +2045,23 @@ "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Tekenen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Knopen tekenen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Modus: tekenmodus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "geselecteerd" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Knoop toevoegen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Knoop in weg toevoegen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Bestaande weg aan knoop koppelen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Knoop in weg voegen en verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Nieuwe node maken." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Selecteer de node onder de cursor." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Nieuwe node toevoegen aan weg." -msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "Start een nieuwe weg vanaf de node." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "Weg voortzetten vanaf laatste knoop." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Tekenen beëindigen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Uittrekken" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Gebieden aanmaken" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Weg uittrekken" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop " -"loslaten." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "De muisknop loslaten om het roteren te stoppen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Een wegsegment verslepen om een rechthoek te maken." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af " -"te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Selecteer" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Objecten selecteren, verplaatsen en roteren" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Een virtuele knoop toevoegen en naar een weg verplaatsen" -msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"De muisknop loslaten om het verplaatsen te stoppen. CTRL om samen te voegen " -"met dichtstbijzijnde knoop." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Objecten verplaatsen door slepen; Shift voegt toe (Ctrl wisselt); Shft-Ctrl " -"roteert selectie; of verander selectie" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoom en verplaats kaart" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Zoom door slepen of CTRL+. of CTRL+,; verplaats met CTRL+omhoog, links, " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Zoeken..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Naar objecten zoeken." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Geen gegevens geladen." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Voer een zoekopdracht in:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "Selectie vervangen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "Toevoegen aan selectie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "Verwijderen uit selectie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "Hoofdlettergevoelig" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "Reguliere expressie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -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:85 -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:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - sleutel 'type' met elke waarde. Probeer ook *=value, " -"type=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Speciale zoekopdrachten:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "type: - objecttype (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "gebruiker:... - alle objecten veranderd door gebruiker" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - object met opgegeven ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - object met opgegeven aantal knopen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - alle aangepaste objecten" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - alle geselecteerde objecten" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - alle incomplete objecten" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "ongetagd - alle objecten zonder tag" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "Gebruik | of OR om te combineren met een logische OR" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Gebruik ( en ) om expressies te groeperen" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Zoeken" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Start zoeken" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Geen overeenkomst gevonden voor ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} overeenkomsten gevonden" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"De regexp \"{0}\" bevat een ontleedfout op positie {1}, complete " -"foutmelding:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Ontbrekende argumenten voor OR." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Ontbrekend argument voor NOT." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Sluithaak verwacht." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Verbinden met {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Downloaden..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Kan niet lezen van URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Ontleedfout in URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Verwijder \"{0}\" voor {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Stel in {0}={1} voor {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "object" -msgstr[1] "objecten" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Verwijder \"{0}\" voor {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Stel in {0}={1} voor {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "{1} {0} verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "{0} {1} verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Conflicterende relatie" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n" -"Uit relatie verwijderen?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Uit relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n" -"Verwijder van relatie?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Wegsegment splitsen" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " -"gedownload.
Dit kan problemen veroorzaken omdat andere objecten (die je " -"niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Verplaatsen" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "knoop" -msgstr[1] "knopen" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Volgorde" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Los {0} tag-conflicten op in {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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 "Versieconflicten voor {0} {1} oplossen" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Toepassen?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Bij het omkeren van de rijrichting worden de volgende veranderingen van " -"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens " -"consistent te houden." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relatie" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Oude rol" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nieuwe rol" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Oude sleutel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Oude waarde" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nieuwe sleutel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nieuwe waarde" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Geselecteerde wijzigingen toepassen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Wijzigingen niet toepassen" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Eigenschappen van " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Rollen in relaties verwijzen naar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatische tagcorrectie" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Configuratiebestand is verminkt in regels {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan voorkeurenmap niet openen: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Voorkeuren opgeslagen op {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Kan geen voorkeuren uploaden. Reden: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Kan geen voorkeuren van server laden." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2561,7 +2073,797 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Tekenen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Knopen tekenen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "Modus: tekenmodus" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "geselecteerd" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Knoop toevoegen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Knoop in weg toevoegen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Bestaande weg aan knoop koppelen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Knoop in weg voegen en verbinden" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Nieuwe node maken." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Selecteer de node onder de cursor." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Nieuwe node toevoegen aan weg." +msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "Start een nieuwe weg vanaf de node." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "Weg voortzetten vanaf laatste knoop." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Tekenen beëindigen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Uittrekken" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Gebieden aanmaken" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Weg uittrekken" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop " +"loslaten." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "De muisknop loslaten om het roteren te stoppen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Een wegsegment verslepen om een rechthoek te maken." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af " +"te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Selecteer" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Objecten selecteren, verplaatsen en roteren" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Een virtuele knoop toevoegen en naar een weg verplaatsen" +msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"De muisknop loslaten om het verplaatsen te stoppen. CTRL om samen te voegen " +"met dichtstbijzijnde knoop." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Objecten verplaatsen door slepen; Shift voegt toe (Ctrl wisselt); Shft-Ctrl " +"roteert selectie; of verander selectie" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoom en verplaats kaart" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Zoom door slepen of CTRL+. of CTRL+,; verplaats met CTRL+omhoog, links, " +"omlaag, rechts; verplaats met rechter knop" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Zoeken..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Naar objecten zoeken." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Voer een zoekopdracht in:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "Selectie vervangen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "Toevoegen aan selectie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "Verwijderen uit selectie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "Hoofdlettergevoelig" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "Reguliere expressie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +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 +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 +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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - sleutel 'type' met elke waarde. Probeer ook *=value, " +"type=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Speciale zoekopdrachten:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +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 +msgid "user:... - all objects changed by user" +msgstr "gebruiker:... - alle objecten veranderd door gebruiker" + +#: ../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 +msgid "modified - all changed objects" +msgstr "modified - alle aangepaste objecten" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - alle geselecteerde objecten" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - alle incomplete objecten" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "ongetagd - alle objecten zonder tag" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children 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: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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Zoeken" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Start zoeken" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "Geen overeenkomst gevonden voor ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "{0} overeenkomsten gevonden" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"De regexp \"{0}\" bevat een ontleedfout op positie {1}, complete " +"foutmelding:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Ontbrekende argumenten voor OR." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Ontbrekend argument voor NOT." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Sluithaak verwacht." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Selectie laden" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Verbinden met {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Downloaden..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Ontleedfout in URL: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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 "Verwijder \"{0}\" voor {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "object" +msgstr[1] "objecten" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Verwijder \"{0}\" voor {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Stel in {0}={1} voor {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Conflict oplossen" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Geen overeenkomst gevonden voor ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "{1} {0} 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 +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?" +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:584 +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?" +msgstr "" +"Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n" +"Verwijder van relatie?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Wegsegment splitsen" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt " +"gedownload.
Dit kan problemen veroorzaken omdat andere objecten (die je " +"niet ziet) ze kunnen gebruiken.
Wil je ze echt verwijderen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Uit relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Verplaatsen" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "knoop" +msgstr[1] "knopen" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Volgorde" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Los {0} tag-conflicten op in {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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 "Versieconflicten voor {0} {1} oplossen" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Toepassen?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Bij het omkeren van de rijrichting worden de volgende veranderingen van " +"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens " +"consistent te houden." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relatie" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Oude rol" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nieuwe rol" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Oude sleutel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Oude waarde" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nieuwe sleutel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nieuwe waarde" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Geselecteerde wijzigingen toepassen" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Wijzigingen niet toepassen" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Eigenschappen van " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Rollen in relaties verwijzen naar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatische tagcorrectie" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Voorkeuren opgeslagen op {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Kan geen voorkeuren van server laden." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2590,5 +2892,5 @@ msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2597,27 +2899,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "onvolledig" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Fout: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Waarschuwing: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2625,13 +2927,13 @@ msgstr[1] "wegen" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2639,22 +2941,22 @@ msgstr[1] "relaties" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2668,23 +2970,23 @@ msgstr[1] "{0} leden" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "snelweg" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "spoorweg" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "waterweg" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "grondgebruik" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2739,5 +3041,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Oppervlak van weg is niet gesloten." @@ -2875,9 +3177,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2894,5 +3191,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "achtergrond" @@ -2903,8 +3200,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2921,5 +3218,5 @@ "nieuwe zone." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert-zone (Frankrijk)" @@ -2942,22 +3239,127 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Kon bladwijzers niet lezen." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Kan bladwijzer niet schrijven." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Niet meer tonen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "onbekend" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Er is een onverwachte fout opgetreden" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Kan niet met de OSM-server verbinden. Controleer je internetverbinding." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Onbekende host" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Melding van de dag niet beschikbaar" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- uitgevoerde versie is {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "\"Dagmelding\" downloaden" @@ -3040,62 +3442,57 @@ msgstr "Wachtwoord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, 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/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "gebruik" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Deze hulptekst tonen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standaard UNIX-geometrieargument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Het omgrensde gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Open bestand (als rawe GPS, indien .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Het omgrensde gebied downloaden als rawe GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Met de opgegeven zoekactie selecteren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Gemaximaliseerd openen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "De voorkeuren herstellen op standaardwaarden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "De taal instellen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "voorbeelden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3105,25 +3502,25 @@ "zorg dat je wat gegevens laadt voor --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "In plaats van --download= kun je ook osm:// opgegeven\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Bijgewerkte plugins activeren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Vroege plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Standaarden instellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -3132,26 +3529,26 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3159,21 +3556,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Draadmodelweergave" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Draadmodelweergave in- of uitschakelen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Volledig scherm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Volledig scherm aan-/uitzetten" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Geluid" @@ -3217,53 +3614,68 @@ msgstr "schalen" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "De geografische lengtegraad bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "De naam van het object bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "De geografische breedtegraad bij de cursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "De hoek tussen het vorige en het huidige wegsegment." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "De (kompas)richting van het lijnsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "De lengte van het nieuwe wegsegment dat wordt getekend." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(geen object)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "laag niet in lijst." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Met OSM-server verbinden..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Probleem tijdens lezen" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3288,4 +3700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initialiseren" @@ -3317,20 +3730,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Eigenschappen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3338,47 +3751,47 @@ msgstr "Knopen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Leden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Geen tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Tags ({0} conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Knopen (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Knopen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Conflicten in de knopen van deze weg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Leden (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3386,25 +3799,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Leden (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3441,5 +3854,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Mijn versie" @@ -3450,5 +3863,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3462,5 +3875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Hun versie" @@ -3535,7 +3948,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3609,14 +4021,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "parameter '{0}' mag niet leeg zijn" @@ -3645,10 +4057,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3657,19 +4069,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3678,9 +4090,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3690,13 +4102,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3704,90 +4116,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Coördinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(geen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "verwijderd" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "niet verwijderd" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Mijn coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Hun coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3797,5 +4209,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3820,12 +4232,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3870,10 +4281,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3882,10 +4293,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3894,5 +4305,5 @@ msgstr "Waarde" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3952,9 +4363,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3962,5 +4373,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3992,6 +4403,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4000,36 +4411,53 @@ "in de bovenstaande lijst." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "Opgeloste conflicten toepassen en dialoog sluiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Toch doorgaan" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 +msgid "Continue resolving" +msgstr "Doorgaan met oplossen" + +#: ../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 "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "Opgeloste conflicten toepassen en dialoog sluiten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "Doorgaan met oplossen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Versieconflicten voor {0} {1} oplossen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4047,96 +4475,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Lagen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "De geselecteerde laag verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Wijzigingen zijn niet opgeslagen. De laag toch verwijderen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Laag verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Wil je de hele laag zeker verwijderen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informatie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "{0} {1} verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Tonen/Verbergen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Zichtbaarheid van een laag in- of uitschakelen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Tekst/pictogrammen tonen/verbergen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Lagen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privé" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "De geselecteerde laag verwijderen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "De geselecteerde laag een rij omlaag verplaatsen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Lagen: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Meer informatie over deze functionaliteit" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4145,22 +4607,28 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Een lege waarde verwijdert de sleutel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Waarden aanpassen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4169,84 +4637,89 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Selecteer een sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Selecteer een waarde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Eigenschappen/Lidmaatschappen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Eigenschappen voor geselecteerde objecten." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Relatie wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Selectie uit relatie {0} zeker verwijderen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Eigenschappen bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Eigenschappen verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "De geselecteerde sleutel in alle objecten verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschappen: {0} / Leden: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Eigenschappen / Leden" @@ -4255,63 +4728,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Een lijst met alle relaties openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relaties: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "De geselecteerde relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Een nieuwe relatie aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relaties: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "De geselecteerde relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Huidige selectie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Een selectielijstscherm openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Naar de geselecteerde element(en) zoomen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "De geselecteerde lijst herladen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Op selectie inzoomen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selectie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4320,5 +4795,5 @@ msgstr[1] "{0} wegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4327,5 +4802,5 @@ msgstr[1] "{0} relaties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4336,5 +4811,10 @@ msgstr "Laat paneel drijven" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4343,143 +4823,411 @@ "werkbalk." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Klik om de paneelinhoud te verkleinen/vergroten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Auteurs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Auteur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objecten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Auteurs: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Gebied downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "De geselecteerde relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Zichtbare tegels downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Tegenstrijdigheden in de gegevens" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relaties" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "{0} downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relaties" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "De laatste ongedaan gemaakte opdracht herstellen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Vernieuwen van de geselecteerde entiteit is niet gelukt." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "De geselecteerde leden omhoog verplaatsen" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "De geselecteerde leden omlaag verplaatsen" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Alle nu geselecteerde objecten uit relatie verwijderen" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "De geselecteerde relatie verwijderen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Doorgaan met oplossen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Tegenstrijdigheden in de gegevens" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Huidige gegevens opslaan." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Leden downloaden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Remote-controlopdracht bevestigen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Uitzoomen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "De geselecteerde leden omlaag verplaatsen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Wijzigingen toepassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Basis" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Bezet door" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Omhoog bewegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "De geselecteerde leden omhoog verplaatsen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Selectie toevoegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Alle geselecteerde objecten als leden toevoegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Geselecteerde verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Alle nu geselecteerde objecten uit relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Omlaag bewegen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "De geselecteerde leden omlaag verplaatsen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Leden downloaden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relatie-editor: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Selectie laden" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4489,5 +5237,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4497,25 +5245,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bladwijzers" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Voer eerst de gewenste coördinaten in." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Voer een naam in voor de locatie." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Locatie veranderen" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Selecteer eerst een bladwijzer." @@ -4550,21 +5295,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Gegevensbronnen en -soorten" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Als nieuwe laag downloaden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4573,13 +5318,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Voer een zoekstring in" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Kan locatiezoekresultaten van server niet lezen" @@ -4587,5 +5332,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Voer een plaats in om naar te zoeken:" @@ -4593,5 +5338,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4599,6 +5344,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "naam" @@ -4637,6 +5382,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4659,15 +5404,15 @@ msgstr "soort" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "nabij" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zoom" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4676,5 +5421,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Slippy-kaart" @@ -4706,5 +5451,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5446,5 +6197,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5611,59 +6362,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Afbeeldingen van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "GPX inlezen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Geen tijd voor punt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Geen afbeeldingen met een leesbare tijd gevonden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Lezen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotagged afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS-start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS-einde: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "Huidige verschil: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "Tijdzoneverschil: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5671,138 +6422,128 @@ msgstr[1] "afbeeldingen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} binnen de track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Klok synchroniseren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-afbeeldingen (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Afbeelding" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Syncroniseer tijd met GPS-apparaat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Ingevoerde tijd kon niet worden ontleed." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "GPS-punt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Lijntekening aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Algemene instellingen gebruiken." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Lijnen tussen punten in deze laag tekenen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Geen lijnen tussen punten in deze laag tekenen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Lijntekenopties selecteren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Kleur aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Standaard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Kies een kleur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Markers van benoemde punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Benoemde trackpunten van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Geluid importeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave-geluidsbestanden (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Geluidsmarkers van {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Afbeeldingen importeren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5811,5 +6552,5 @@ msgstr[1] "{0} tracks, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5818,5 +6559,5 @@ msgstr[1] "{0} routes, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5825,30 +6566,30 @@ msgstr[1] "{0} waypoints" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Naam: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Beschrijving: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Tijdsperiode: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Lengte: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Naar gegevenslaag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5858,43 +6599,43 @@ "zijn.
Als je sporen wilt uploaden, kijk dan hier:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Omgezet van: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Alles downloaden binnen:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} meters" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5905,9 +6646,9 @@ "verder
gaan?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5917,5 +6658,5 @@ "de track zijn overgeslagen of naar de start verplaatst." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5925,47 +6666,47 @@ "kunnen schatten, zijn overgeslagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Gegevenslaag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "versie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} verwijderd.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API-versie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5990,5 +6731,5 @@ msgstr[1] "tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5996,5 +6737,5 @@ msgstr[1] "Punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6003,5 +6744,5 @@ msgstr[1] "Een track met {0} punten" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6010,5 +6751,5 @@ msgstr[1] "{0} bestaat uit {1} tracks" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6027,5 +6768,5 @@ msgstr[1] "markers" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6034,29 +6775,29 @@ msgstr[1] "{0} bestaat uit {1} markers" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Geluid synchroniseren" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Geluid gesynchroniseerd op punt {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Kan in de afgespeelde laag niet synchroniseren." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Geluidsmarker op afspeelstart zetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6066,10 +6807,17 @@ "marker wilt hebben." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Tekst/pictogrammen tonen/verbergen" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6079,5 +6827,5 @@ "geluidsopname afspeelde (na de eerste marker)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6087,29 +6835,29 @@ "of op het trackpunt waar je wilt synchroniseren." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Kan nieuwe geluidsmarker niet aanmaken." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Fout tijdens het tonen van de URL van deze marker" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL was: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Fouten tijden tonen URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Uitgebreide voorkeuren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Voorkeuren direct instellen. Voorzichtig gebruiken!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6117,26 +6865,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Huidige waarde is standaard." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Standaardwaarde is ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Selecteer een rij om te bewerken." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6144,14 +6892,14 @@ msgstr "Nieuwe waarde voor {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Selecteer een rij om te verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Nieuw sleutel/waardepaar invoeren" @@ -6291,40 +7039,40 @@ msgstr "Calibratie geluidsopname" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Kleur" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Tekenstijl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Laag: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Kies" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Selecteer een kleur voor {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Naar standaardwaarde zetten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Alles naar standaardwaarde zetten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Kleuren gebruikt door verschillende objecten in JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Kleuren" @@ -6668,46 +7416,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Beschikbare plugins configureren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Lijst downloaden" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Update" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Sites configureren..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Selecteer een invoer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Plugin-site configureren" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Beeldscherminstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6716,29 +7472,29 @@ "Verschillende instellingen die het uiterlijk van het programma beïnvloeden." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Verbindingsinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Verbindingsinstellingen voor de OSM-server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Kaartinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Instellingen voor kaartprojectie en interpretatie van gegevens." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Geluidsinstellingen" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Instellingen voor de geluidsspeler en geluidsmarkers." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren." @@ -6840,59 +7596,61 @@ msgstr "Sneltoets" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "De rij om te kopiëren selecteren." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "De geselecteerde bron uit de lijst verwijderen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7084,33 +7842,33 @@ msgstr "Groepen aanpastoetsen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Meer informatie over deze functionaliteit" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Optionele attributen:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Voorkeuze ''{0}'' gebruiken" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "afgesloten weg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7121,15 +7879,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementen van type {0} worden ondersteund." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7139,18 +7897,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -7161,33 +7919,36 @@ msgstr "Voorkeuzegroep ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Met OSM-server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Downloaden van punten {0} tot {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "OSM-gegevens downloaden" - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Gegevens voorbereiden..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kan \"{0}\" niet lezen" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7195,21 +7956,21 @@ msgstr "GPX-bestanden" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markers van {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7225,10 +7986,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "OSM-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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7236,48 +8016,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183-bestanden" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Geïmporteerde coördinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Misvormde zinnen: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Controlegetalfouten: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Onbekende zinnen: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Nulcoördinaten: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA-import gelukt" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Importeren NMEA is mislukt!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7286,15 +8065,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7302,23 +8081,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Changeset openen" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Voorbereiden…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Uploaden..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Map {0} scannen" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7361,9 +8153,4 @@ msgid "Login" msgstr "Login" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Afbreken..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7414,66 +8201,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Fout tijdens ontleden." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM Server bestanden" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Onbekende versie" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "-element in niet-weg gevonden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " heeft geen referenties" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "-element in niet-relatie gevonden." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Incomplete -specificatie met ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Ongeldig object met id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7481,46 +8272,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Verplicht attribuut \"{0}\" ontbreekt." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "OSM-gegevens voorbereiden..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Misvormde knoop-id" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Met server verbinden..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7528,5 +8339,18 @@ "Kan niet met de OSM-server verbinden. Controleer je internetverbinding." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7535,16 +8359,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} te gaan. Uploading {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Plugins bijwerken" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Plugins downloaden" @@ -7561,5 +8380,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7568,23 +8387,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7595,34 +8414,32 @@ msgstr "Een fout opgetreden in plugin {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Waarschuwing - verzoek tot laden van {0}-plugin. Deze plugin is niet langer " "noodzakelijk." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin niet gevonden: {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Laatste plugin-update is meer dan {0} dagen geleden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7632,21 +8449,21 @@ "via de configuratieoptie 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Plugin uitschakelen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7656,5 +8473,5 @@ "rechten heeft om de bestaande plugins te overschrijven." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7664,10 +8481,10 @@ "\"-plugin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Volgens de informatie in de plugin, is de auteur {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7676,9 +8493,9 @@ "fout rapporteert." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Moet de plugin worden uitgeschakeld?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7688,27 +8505,23 @@ "uit de applicatie te halen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"De plugin kan niet worden verwijderd. Informeer de ontwikkelaars van JOSM " -"over dit probleem." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informatie" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Geen plugin-informatie gevonden." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "geen omschrijving beschikbaar" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7717,13 +8530,18 @@ msgstr[1] "Plugin-informatie van {0} sites downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Geen plugin-informatie gevonden." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Alle geïnstalleerde plugins zijn bijgewerkt." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7736,9 +8554,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Ontbrekende plugins downloaden" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7751,57 +8569,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "onbekend" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: versie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin gebundeld met JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Fout tijdens lezen plugin-informatiebestand: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Dit is na het einde van de opname" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Fout tijdens afspelen van het geluid" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Niets doen" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Fout melden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7815,19 +8611,19 @@ "van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Er is een onverwachte fout opgetreden" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Maak een melding bij {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7837,17 +8633,33 @@ "je de fout meldt." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Voeg zeker de volgende informatie toe:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(De tekst is reeds gekopieerd naar je klembord.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Niet meer tonen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7860,5 +8672,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7868,5 +8680,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7877,13 +8689,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7891,21 +8718,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Spoor uploaden" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7913,74 +8740,75 @@ msgstr "Sporen uploaden" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Openbaar" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Beschrijving" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Geselecteerde track: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Verbinden..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Uploaden afgebroken" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Uploaden is mislukt" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-track is geupload" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Upload is mislukt. Server gaf de volgende melding: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "GPX-track uploaden: {0}% ({1} van {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Geen beschrijving opgegeven. Voer deze s.v.p. in," -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Geen GPX-laag geselecteerd. Kan geen spoor uploaden." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Geen gebruikersnaam opgegeven." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Geen wachtwoord opgegeven." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "GPX-track uploaden" @@ -8050,33 +8878,34 @@ msgstr "Een van de geselecteerde bestanden was leeg!!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Foto's lezen..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kan geen canoniek pad voor map {0} krijgen\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Map {0} scannen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Leeg bestand in {0} gevonden\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Bestanden uit map {0} halen is mislukt\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Met GPX relateren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8096,15 +8925,15 @@ msgstr "GPX-bestanden (*.gpx, *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Bestand {0} is geladen met de naam \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Fout tijdens ontleden {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8116,34 +8945,34 @@ "een tijdzone
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Fototijd (uit exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "GPS-tijd (lees uit de bovenstaande foto): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Ik bevind mij in tijdzone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Geen datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Open een andere foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8153,70 +8982,70 @@ "Gebruik de verwachte indeling a.u.b." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Ongeldige datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX-track: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Een ander GPX-spoor openene" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Tijdzone: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Verschuiving:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Ik kan een foto van mijn GPS-ontvanger maken.
Zou dat helpen?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Locatie bijwerken van: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Alle afbeeldingen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Afbeelding zonder EXIF-locatie" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Nog niet getagde afbeeldingen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Verband tussen afbeeldingen en GPX-tracks leggen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Correleer" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Automatisch schatten" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "U mag een GPX-track selecteren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Geen GPX-tracks geselecteerd" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8227,9 +9056,9 @@ "Verwachte indeling: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Ongeldige tijdzone" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8240,26 +9069,26 @@ "Verwachte indeling: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Ongeldige verschuiving" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX-track geladen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "De selecteerde foto's bevatten geen tijdinformatie." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Foto's bevatten geen tijdinformatie." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8267,39 +9096,39 @@ "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX-track heeft geen tijdinformatie" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Tijdzone: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minuten: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Seconden: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "{0} van de {1} foto's komen overeen met GPX-track." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Tijdverschil van {0} dagen)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8307,13 +9136,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 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:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Tijdzone en tijdverschil aanpassen" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Standaardwaarden" @@ -8335,5 +9164,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Laden bestand is mislukt" @@ -8356,6 +9185,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: ongeldige URL." @@ -8534,22 +9363,22 @@ msgstr "Voeg \"source=...\" toe aan elementen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "{0} downloaden" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Met WMS-server verbinden..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Gebouwen aanmaken" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8559,18 +9388,18 @@ "is importeergrootte beperkt tot maximaal 1 km2." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Schakel auto-sourcing in en controleer cadastre millesime." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "SVG ViewBox uitnemen..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Best passende grens uitnemen" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Kader aanmaken" @@ -8688,6 +9517,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Lege laag" @@ -8716,5 +9545,5 @@ msgstr "Omvattende reschthoek gemeente: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8725,14 +9554,14 @@ "Maak een nieuwe aan." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Fout in bufferstructuur" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Fout in buffer Lambert-zone" @@ -8820,4 +9649,9 @@ msgstr "Kan geen niet-geordende weg dupliceren." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Geen gegevens geladen." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8828,9 +9662,9 @@ msgstr "Weg dupliceren" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8951,30 +9785,30 @@ msgstr "gegevens na importeren wissen" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Gegevens van apparaat importeren." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Gegevens van DG100 importeren..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Gegevens wissen is mislukt." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "gegevens importeren van {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Geen gegevens op apparaat gevonden." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Verbinding is mislukt." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8986,14 +9820,14 @@ "josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat-gegevens importeren" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Gegevens van Globalsat Datalogger DG100 in GPX-laag importeren." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importeren" @@ -9084,40 +9918,40 @@ msgstr "Afbeeldingen met ImageWayPoint openen" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Richtingsindex '{0}' niet gevonden" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "De beginlocatie bevindt zich buiten de bbox" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Zoeken naar de oever..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "{0} knopen tot nu toe..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Aanmaken map voor buffergeheugen is mislukt: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Tracing" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "Buffergeheugen controleren..." @@ -9126,26 +9960,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Knooppunten reductie uitvoeren..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Douglas-Peuckerbenadering uitvoeren..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Dubbele knopen verwijderen..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker-trace" @@ -9230,7 +10056,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "water" @@ -9386,9 +10212,9 @@ msgstr "Voorkeuren Lakewalker-plugin" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Afbeeldingstegel downloaden..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kan afbeelding niet ophalen" @@ -9634,18 +10460,18 @@ msgstr "Onderwerpstatus onbekend" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Zichtbare openen." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Alleen bestanden die zichtbaar zijn in het huidige beeld openen." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Geen beeld geopend - kan de grenzen niet bepalen!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9672,33 +10498,33 @@ msgstr "Firefox-executable" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "gegevens uit API laden" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "de selectie aanpassen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "het venster aanpassen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "Alle remote-controlopdrachten handmatig bevestigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Een plugin waarmee JOSM door andere applicaties geregeld kan worden." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Afstandsbediening" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Instellingen voor de Afstandsbedieningsplugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9710,28 +10536,28 @@ "applicaties die met deze plugin communiceren." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Toegestane opdrachten" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Gewenste details: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Wil je dit toestaan?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Remote-controlopdracht bevestigen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9996,4 +10822,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10248,34 +11095,34 @@ "gesprongen." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Lat/lon invoeren om naar toe te springen." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoom (in metres)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Spring daarheen" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Spring naar positie" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Kan lat/lon niet ontleden." @@ -10310,6 +11157,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Validatiefouten" @@ -10319,10 +11166,10 @@ msgstr "Geen validatiefouten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Raster" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10413,23 +11260,15 @@ msgstr "Gegevensvalidatie uitvoeren" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Gegevens met fouten. Toch uploaden?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Het validatiescherm openen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Op probleem inzoomen" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Valideren" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Valideer de huidige selectie of de totale gegevensset." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10502,23 +11341,23 @@ msgstr "Kruisende wegen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Dubbele knopen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Dubbele wegknopen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Op wegen met identieke, opeenvolgende knopen controleren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Dubbele wegknopen" @@ -10597,24 +11436,24 @@ "gespeld zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Eigenschapchecker:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" "Deze plugin controleert op fouten in sleutels en waarden van eigenschappen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ongeldige regel tagchecker - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ongeldige regel spellingschecker: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10625,7 +11464,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Ongeldige tag/waarde-combinaties" @@ -10633,79 +11472,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Tekenprobleem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Toets ''{0}'' is ongeldig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Tags met lege waarden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Ongeldige eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Ongeldige spatie in eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Eigenschapwaarde begin of eindigt met een spatie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Eigenschapwaarden bevatten HTML-codes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Voorkeuzen bevatten geen eigenschapsleutel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Voorkeuzen bevatten geen eigenschapswaarde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "Herstel-mij's" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Eigenschapsleutels controleren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Valideer eigenschapsleutels met een woordenlijst" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Uitgebreide eigenschapchecker gebruiken" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Tagcheckerbron" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10716,82 +11557,82 @@ "tagchecker." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Nieuwe bron aan lijst toevoegen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "De geselecteerde bron bewerken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Gegevensbronnen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Eigenschapwaarden controleren." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Valideer eigenschapwaarden tegen presets" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Controleer op herstel-mij's." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Controleer op tekenknopen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Controleer of kaarttekenen fouten heeft gevonden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Standaardgegevensbestand gebruiken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Standaardbestand spellingscontrole gebruiken." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Eigenschappen herstellen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Kan elementsoort niet vinden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Kan waarschuwingsniveau niet vinden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ongeldige expressie ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10936,7 +11777,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "gebouw" @@ -10950,5 +11791,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "gebied" @@ -10984,10 +11825,10 @@ msgstr "Wegeindknoop dicht bij andere weg verbonden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Ongetagde en niet-verbonden knopen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11043,8 +11884,32 @@ msgstr "Omgekeerde land: land niet aan linker zijde" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11055,10 +11920,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11107,14 +11972,14 @@ msgstr "WMS-pluginhulp" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Geogerefereerde afbeelding..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11125,26 +11990,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11152,5 +12017,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11160,5 +12025,5 @@ msgstr "De positie van de geselecteerde WMS-laag aanpassen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11170,19 +12035,19 @@ "Dat kan tot foutieve coördinaten leiden." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatisch downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-laag ({0}), in zoom {1} downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11190,89 +12055,89 @@ "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:231 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Voorkeuren WMS-plugin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menunaam" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS-URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Menunaam (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS-URL (standaard)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Een menunaam en WMS-URL invoeren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Standaardwaarde kopiëren" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11381,11 +12246,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11395,10 +12265,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11406,5 +12276,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11414,5 +12284,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11422,15 +12292,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11438,5 +12308,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11444,5 +12314,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11451,15 +12321,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11468,10 +12338,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11480,15 +12350,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11498,10 +12368,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11510,5 +12380,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11517,5 +12387,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11523,11 +12393,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12682,58 +13559,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12747,6 +13572,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Autosnelweg" @@ -12772,6 +13597,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "autoweg" @@ -12797,6 +13622,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "provinciale weg" @@ -12822,6 +13647,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "N-weg" @@ -12835,5 +13660,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "weg buiten bebouwde kom" @@ -12851,5 +13676,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "woongebied" @@ -12883,6 +13708,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "toegangsweg" @@ -12909,6 +13734,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "werkzaamheden" @@ -12958,5 +13783,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rotonde" @@ -13935,5 +14760,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "moeras" @@ -15664,27 +16489,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18523,7 +19348,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "fiets" @@ -18593,7 +19418,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "voet" @@ -18619,5 +19444,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -19108,13 +19933,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "vervallen" @@ -19156,5 +19981,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "paard" @@ -19374,4 +20199,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Motorsport" + #. color tertiary #. @@ -19406,6 +20293,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "straat" @@ -19461,7 +20348,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "snelwegroute" @@ -19517,8 +20404,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "spoor" @@ -19539,5 +20426,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19551,5 +20438,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19570,5 +20457,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "Omkeermogelijkheid" @@ -19583,5 +20470,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19596,5 +20483,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "rivierbank" @@ -19608,5 +20495,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "stroom" @@ -19620,5 +20507,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "dok" @@ -19646,5 +20533,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "aquaduct" @@ -19812,13 +20699,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "kunstmatig" @@ -19880,7 +20767,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "spoorwegpunt" @@ -19903,10 +20790,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "ander spoor" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "spoorovergang" @@ -19942,7 +20829,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "oud spoor" @@ -19987,6 +20874,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "luchtverbinding" @@ -20000,5 +20887,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20020,5 +20907,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "luchtverbinding_donker" @@ -20032,5 +20919,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "luchtverbinding_licht" @@ -20078,7 +20965,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "kabelbaan" @@ -20095,5 +20982,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "piste_eenvoudig" @@ -20108,5 +20995,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "piste_middelmatig" @@ -20121,5 +21008,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "piste_gevorderden" @@ -20134,5 +21021,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20147,5 +21034,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "piste_vrijekuur" @@ -20160,5 +21047,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "piste_beginner" @@ -20263,10 +21150,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "kracht" @@ -20280,5 +21167,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "pijler" @@ -20292,5 +21179,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "pijplijn" @@ -20418,12 +21305,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "vrije tijd" @@ -20437,5 +21324,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "jachthaven" @@ -20507,8 +21394,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "voorziening" @@ -20610,10 +21497,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "voorziening_verkeer" @@ -20999,22 +21886,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "voorziening_licht" @@ -21046,6 +21933,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "licht_water" @@ -21106,8 +21993,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "gezondheid" @@ -21460,26 +22347,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "winkel" @@ -21551,8 +22438,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21702,9 +22589,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "toerisme" @@ -21776,8 +22663,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historisch" @@ -21848,8 +22735,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "groen" @@ -21863,5 +22750,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "mijnbouw" @@ -21875,5 +22762,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "vuilstortplaats" @@ -21895,5 +22782,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "estuarium" @@ -21907,5 +22794,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "bosbouw" @@ -21919,5 +22806,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "landbouwgrond" @@ -21940,5 +22827,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "winkelcentrum" @@ -21952,5 +22839,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industrieel" @@ -21964,5 +22851,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "braakliggend gebied" @@ -21976,5 +22863,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "ontwikkelingsgebied" @@ -21988,5 +22875,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "Rangeerterrein" @@ -22043,7 +22930,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "militair gebruik" @@ -22057,5 +22944,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "begraafplaats" @@ -22068,5 +22955,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "berg of -heuveltop" @@ -22081,5 +22968,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "gletsjer" @@ -22093,5 +22980,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulkaan" @@ -22146,8 +23033,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "Natuurlijk" @@ -22161,5 +23048,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "ruig land" @@ -22173,5 +23060,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "heide" @@ -22185,5 +23072,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "oerbos" @@ -22197,5 +23084,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "slikgronden" @@ -22209,5 +23096,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "strand" @@ -22285,8 +23172,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "route" @@ -22334,7 +23221,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "grens" @@ -22476,10 +23363,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "plaats" @@ -22527,6 +23414,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adres" @@ -22823,74 +23710,108 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Gegevenslaag" - -#~ msgid "Uploading data" -#~ msgstr "Gegevens uploaden" +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend " +#~ "of gedownload?" + +#~ msgid "No data" +#~ msgstr "Geen gegevens" + +#~ msgid "Layers: {0}" +#~ msgstr "Lagen: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "De plugin kan niet worden verwijderd. Informeer de ontwikkelaars van JOSM " +#~ "over dit probleem." + +#~ msgid "Validate" +#~ msgstr "Valideren" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Valideer de huidige selectie of de totale gegevensset." #~ msgid "Not implemented yet." #~ msgstr "Nog niet geïmplementeerd." -#~ msgid "Email" -#~ msgstr "E-mail" +#~ msgid "position" +#~ msgstr "positie" + +#~ msgid "Aborting..." +#~ msgstr "Afbreken..." + +#~ msgid "different" +#~ msgstr "verschillend" + +#~ msgid "true" +#~ msgstr "Waar" + +#~ msgid "Change" +#~ msgstr "Aanpassen" #~ msgid "Resolve Conflicts" #~ msgstr "Conflicten oplossen" +#~ msgid "unnamed" +#~ msgstr "Onbenoemd" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " +#~ "later nog eens." + +#~ msgid "Commit comment" +#~ msgstr "Opmerking bevestigen" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin vereist JOSM-update: {0}" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Met OSM-server verbinden..." + +#~ msgid "Add Selected" +#~ msgstr "Selectie toevoegen" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (lege waarde verwijdert de tag)" + +#~ msgid "Occupied By" +#~ msgstr "Bezet door" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Alle geselecteerde objecten als leden toevoegen" + +#~ msgid "Error parsing server response." +#~ msgstr "Ontleden van de serverreactie is mislukt." + #~ msgid "There were conflicts during import." #~ msgstr "Er zijn conflicten tijdens het importeren." +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klik Herladen om lijst te verversen" + +#~ msgid "Revert" +#~ msgstr "Terugdraaien" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan niet met server verbinden." + #~ msgid "Object" #~ msgstr "Object" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} object heeft een conflict:" -#~ msgstr[1] "{0} objecten hebben een conflict:" - -#~ msgid "my version:" -#~ msgstr "mijn versie:" - -#~ msgid "their version:" -#~ msgstr "hun versie:" - -#~ msgid "resolved version:" -#~ msgstr "samengevoegde versie:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Loginnaam (e-mail) van het OSM-account." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-gebruikersnaam (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Onbekende host" - -#~ msgid "position" -#~ msgstr "positie" - -#~ msgid "different" -#~ msgstr "verschillend" - -#~ msgid "true" -#~ msgstr "Waar" - -#~ msgid "false" -#~ msgstr "onwaar" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Los {0} conflicten in {1} objecten op" - -#~ msgid "Change" -#~ msgstr "Aanpassen" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klik Herladen om lijst te verversen" - -#~ msgid "Revert" -#~ msgstr "Terugdraaien" - -#~ msgid "Date" -#~ msgstr "Datum" #~ msgid "" @@ -22901,40 +23822,12 @@ #~ "geselecteerd in de geschiedenislijst." -#~ msgid "Rotate" -#~ msgstr "Roteren" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (lege waarde verwijdert de tag)" - -#~ msgid "Error parsing server response." -#~ msgstr "Ontleden van de serverreactie is mislukt." - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan niet met server verbinden." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen." - #~ msgid "Add either site-josm.xml or Wiki Pages." #~ msgstr "site-josm.xml of Wiki-paginas toevoegen." -#~ msgid "Tagging preset source" -#~ msgstr "Bron tagvoorkeuze" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen." - -#~ msgid "Tagging preset sources" -#~ msgstr "Bronnen tagvoorkeuzen" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " -#~ "later nog eens." - -#~ msgid "Commit comment" -#~ msgstr "Opmerking bevestigen" +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin bestaat al" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22943,19 +23836,54 @@ #~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b." +#~ msgid "Rotate" +#~ msgstr "Roteren" + #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Kan plugin niet downloaden: {0} van {1}" -#~ msgid "Navigation" -#~ msgstr "Navigatie" +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Sommige knopen zitten (bijna) op de lijn" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload." + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "De projectie \"{0}\" is alleen ontwikkeld\n" +#~ "voor breedtegraden tussen 46.1° and 57°.\n" +#~ "Gebruik een andere projectie als je geen\n" +#~ "gebruik maakt van een Franse WMS-server.\n" +#~ "Upload geen gegevens na deze melding." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden " +#~ "door de bestaande te verwijderen?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Import TCX File..." +#~ msgstr "TCX-bestand importeren..." #~ msgid "image not loaded" #~ msgstr "afbeelding is niet geladen" -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zoom: muiswiel of dubbelklik. Verplaats kaart: rechter muisknop " -#~ "indrukken en muis bewegen. Selecteer" +#~ msgid "Import TCX file as GPS track" +#~ msgstr "TCX-bestand als GPS-track importeren" #~ msgid "Metacarta Map Rectifier image id" @@ -22964,76 +23892,4 @@ #~ msgid "rectifier id={0}" #~ msgstr "rectifier-id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "De positie van de WMS-laag aanpassen" - -#~ msgid "Charge" -#~ msgstr "Lading" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Server ondersteunt geen changesets" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin vereist JOSM-update: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin bestaat al" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Sommige knopen zitten (bijna) op de lijn" - -#~ msgid "Drawbridge" -#~ msgstr "Kabelbrug" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?" - -#~ msgid "Import TCX File..." -#~ msgstr "TCX-bestand importeren..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "TCX-bestand als GPS-track importeren" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "WAARSCHUWING: het wachtwoord wordt als gewone tekst in het " -#~ "voorkeurenbestand opgeslagen
en ook als gewone tekst naar de server " -#~ "verzonden, verwerkt in de URL.
Gebruik dus geen waardevol " -#~ "wachtwoord." - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "De bronnen (URL of bestandsnaam) van bestanden met " -#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/" -#~ "TaggingPresets voor hulp." #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" @@ -23091,42 +23947,32 @@ #~ "twijfel: niet gebruiken." -#~ msgid "Portcullis" -#~ msgstr "Valhek" +#~ msgid "OSM username (email)" +#~ msgstr "OSM-gebruikersnaam (e-mail)" #~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." #~ msgstr "" -#~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload." +#~ "WAARSCHUWING: het wachtwoord wordt als gewone tekst in het " +#~ "voorkeurenbestand opgeslagen
en ook als gewone tekst naar de server " +#~ "verzonden, verwerkt in de URL.
Gebruik dus geen waardevol " +#~ "wachtwoord." + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "De positie van de WMS-laag aanpassen" + +#~ msgid "Navigation" +#~ msgstr "Navigatie" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?" #~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." #~ msgstr "" -#~ "De projectie \"{0}\" is alleen ontwikkeld\n" -#~ "voor breedtegraden tussen 46.1° and 57°.\n" -#~ "Gebruik een andere projectie als je geen\n" -#~ "gebruik maakt van een Franse WMS-server.\n" -#~ "Upload geen gegevens na deze melding." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden " -#~ "door de bestaande te verwijderen?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Conflicten: {0}" - -#~ msgid "viaduct" -#~ msgstr "viaduct" +#~ "Zoom: muiswiel of dubbelklik. Verplaats kaart: rechter muisknop " +#~ "indrukken en muis bewegen. Selecteer" #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -23134,9 +23980,96 @@ #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download" -#~ msgid "sports" -#~ msgstr "Sportartikelen" +#~ msgid "Conflicts: {0}" +#~ msgstr "Conflicten: {0}" + +#~ msgid "Tagging preset source" +#~ msgstr "Bron tagvoorkeuze" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "De bronnen (URL of bestandsnaam) van bestanden met " +#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/" +#~ "TaggingPresets voor hulp." + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen." + +#~ msgid "Tagging preset sources" +#~ msgstr "Bronnen tagvoorkeuzen" + +#~ msgid "viaduct" +#~ msgstr "viaduct" + +#~ msgid "Drawbridge" +#~ msgstr "Kabelbrug" + +#~ msgid "Portcullis" +#~ msgstr "Valhek" + +#~ msgid "false" +#~ msgstr "onwaar" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Los {0} conflicten in {1} objecten op" + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Data Layer" +#~ msgstr "Gegevenslaag" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Loginnaam (e-mail) van het OSM-account." + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} object heeft een conflict:" +#~ msgstr[1] "{0} objecten hebben een conflict:" + +#~ msgid "my version:" +#~ msgstr "mijn versie:" + +#~ msgid "their version:" +#~ msgstr "hun versie:" + +#~ msgid "resolved version:" +#~ msgstr "samengevoegde versie:" + +#~ msgid "Server does not support changesets" +#~ msgstr "Server ondersteunt geen changesets" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n" + +#~ msgid "Charge" +#~ msgstr "Lading" #~ msgid "Download Image from french Cadastre WMS" #~ msgstr "Afbeelding van Franse Cadastre WMS downloaden" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "" +#~ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}" #~ msgid "" @@ -23155,17 +24088,24 @@ #~ "gemaakt." -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "" -#~ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}" +#~ msgid "sports" +#~ msgstr "Sportartikelen" + +#~ msgid "Remove Selected" +#~ msgstr "Geselecteerde verwijderen" + +#~ msgid "Basic" +#~ msgstr "Basis" + +#~ msgid "Move Down" +#~ msgstr "Omlaag bewegen" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relatie-editor: {0}" + +#~ msgid "Move Up" +#~ msgstr "Omhoog bewegen" #~ msgid "Delete and Download" #~ msgstr "Verwijder en download" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd." - -#~ msgid "Solve Conflict" -#~ msgstr "Conflict oplossen" #~ msgid "" @@ -23183,4 +24123,7 @@ #~ "doorgaan?" +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd." + #~ msgid "" #~ "An error occured while trying to match the photos to the GPX track. You " @@ -23189,7 +24132,4 @@ #~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de " #~ "schuifbalken handmatig aanpassen zodat ze met de foto's overeenkomen." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Tijdens bulkdownload traden de volgende fouten op:" #~ msgid "Edit Drawbridge" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 16826) +++ /applications/editors/josm/i18n/po/pl.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:31+0000\n" -"Last-Translator: Łukasz Cieśnik \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-31 07:14+0000\n" +"Last-Translator: Paweł Madej \n" "Language-Team: Polish \n" "MIME-Version: 1.0\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-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -23,79 +23,159 @@ "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Przygotowywanie interfejsu użytkownika" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +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/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Niezapisane zmiany" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Zmiany nie zostały zapisane. Odrzucić je?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Zapisz i wyjdź" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Porzuć i wyjdź" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -104,32 +184,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Anuluj" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Uwaga" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "NIEZNANA" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "O programie" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Wyświetla informacje o programie JOSM." @@ -137,10 +277,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -148,5 +288,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -155,19 +295,19 @@ msgstr "Wersja {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Ostatnia zmiana o {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Wersja Javy {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Strona domowa" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Raporty o błędach" @@ -177,37 +317,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Info" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Plik Readme" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Wersja" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Autorzy" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licencja" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Wtyczki" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "O JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Plik nie został odnaleziony." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -215,17 +359,12 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +"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 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Uwaga" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -234,7 +373,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Proszę wybrać wiersz do usunięcia" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Wybierz przynajmniej:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Połącz węzły" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Dodaj węzeł..." @@ -246,14 +413,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -261,57 +430,57 @@ msgstr "Edycja: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Podaj współrzędne nowego węzła." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Użyj stopni dziesiętnych." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Szerokość" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Długość" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Wyrównaj węzły na kole" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -327,25 +496,58 @@ msgstr "Narzędzie: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Wybierz co najmniej cztery węzły." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Wyrównaj węzły wzdłuż prostej" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Wybierz co najmniej trzy węzły." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -353,19 +555,13 @@ "{0}, max is {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +"Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość " +"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 msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +msgstr "Naruszenie możliwości API" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -374,5 +570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -381,46 +577,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "dane" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "warstwa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "pobrany obszar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Pokaż {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Powiększ aby pokazać: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -430,30 +626,30 @@ msgstr "Widok: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Brak zaznaczenia, które można pokazać" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Wybierz co najmniej dwie drogi do połączenia." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Czy połączyć drogi, które należą do różnych relacji?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -461,13 +657,13 @@ msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../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:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Zmienić kierunek?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -477,10 +673,10 @@ "zmienić kierunek niektórych dróg?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Odwróć i połącz" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -488,20 +684,20 @@ msgstr "Podaj wartości dla wszystkich konfliktów." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Rozwiąż konflikty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Połącz {0} dróg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Wszystkie trasy są puste" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -520,74 +716,78 @@ msgstr "Kopiuje zaznaczone obiekty do schowka." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Proszę wybrać coś do skopiowania." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Utwórz okrąg" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Tworzy okrąg na podstawie trzech zaznaczonych węzłów." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Wybrane węzły nie tworzą okręgu." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Proszę wybrać dwa lub trzy węzły lub drogę składającą się dokładnie z dwóch " +"lub trzech węzłów." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Usuń" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Usuwa wybrane obiekty" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Zastąp" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Rozmieść węzły" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" @@ -595,38 +795,72 @@ "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Pobiera dane mapy z serwera OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Plik: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Pobieranie" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Należy wybrać przynajmniej jeden element do pobrania" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Błędy podczas pobierania" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Powiel" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Powiela zaznaczone obiekty." @@ -646,5 +880,5 @@ msgstr "Kończy pracę z programem." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -654,58 +888,73 @@ "tras na licencji GPL." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Eksportuj do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Eksportuj dane do pliku GPX" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nie ma nic do wyeksportowania. Utwórz jakieś obiekty." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "Opis trasy GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Dodaj informacje o autorze" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Imię i nazwisko" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +msgstr "E-Mail" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Prawa autorskie (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefiniowane" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Prawa autorskie - rok" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Słowa kluczowe" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opcje eksportu" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Eksportuj i zapisz" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -716,25 +965,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Błąd" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Wybierz jedną z gotowych licencji" @@ -744,46 +973,49 @@ msgstr "Pomoc JOSM w sieci" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Otwórz w przeglądarce" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Edycja" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Odśwież" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Błąd w czasie ładowania strony {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +msgstr "Brak strony pomocy. Utwórz ją w języku angielskim." + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -791,4 +1023,6 @@ "\">your language." msgstr "" +"Brak strony pomocy. Utwórz ją w języku angielskim lub swoim języku." #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15 @@ -799,14 +1033,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Wyświetl historyczne informacjie o drogach, węzłach i relacjach OSM." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Informacje o elemencie" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Wyświetl informacje obiektowe o węźle, drodze lub relacji OSM." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -819,30 +1053,40 @@ msgstr "Łączy węzeł z najbliższym odcinkiem drogi" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Połącz węzeł i linię" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Brak skrótu" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Scal mimo tego" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -850,9 +1094,9 @@ msgstr "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Scal mimo tego" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -860,60 +1104,71 @@ "używana." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Scal {0} węzłów" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Odbicie lustrzane" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Odwraca zaznoczone węzły i drogi." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Wybierz co najmniej jeden węzeł lub drogę." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "do góry" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Przesuń obiekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "na dół" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "w lewo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "w prawo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Przesuń {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Przesuwa obiekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nie można przenieść zaznaczonych obiektów poza świat." @@ -921,5 +1176,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nowa" @@ -929,26 +1184,17 @@ msgstr "Tworzy nową mapę" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "bez nazwy" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Otwórz..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Otwiera plik." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nie można odczytać \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -977,22 +1223,22 @@ msgstr "Adres URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Korekta prostopadłości" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Dozwolone są tylko dwa węzły" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Zaznaczenie musi składać się wyłącznie z dróg." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1000,14 +1246,15 @@ "czterech węzłach." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Ustawiono odwzorowanie EPSG:4326, które może powodować
niepożądane " @@ -1015,9 +1262,9 @@ "odwzorowania, aby wyłączyć to ostrzeżenie.
Czy kontynuować?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Wybrano tylko jeden węzeł" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Korekta prostopadłości" @@ -1033,11 +1280,11 @@ msgstr "Wkleja zawartość schowka." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Wklej znaczniki" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1065,16 +1312,21 @@ msgstr "Powtarza ostatnio wycofaną czynność." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Zmień nazwę warstwy" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "zmień także nazwę pliku" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Nie można zmienić nazwy pliku \"{0}\"" @@ -1088,9 +1340,9 @@ msgstr "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Proszę zaznaczyć co najmniej jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Odwróć kierunek dróg" @@ -1098,17 +1350,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Zapisz" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Zapisuje bieżące dane." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +msgstr "Plik {0} już istnieje. Nadpisać?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1118,25 +1372,25 @@ "conditions for no layer\"." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Pusty dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokument nie zawiera żadnych danych." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Zapisz pomimo tego" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1146,54 +1400,75 @@ "odrzucone. Czy kontunuować?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Odrzuć konflikty i zapisz" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Zapisz plik OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Zapisz plik GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Zapisz warstwę" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Nie można utworzyć kopii zapasowej pliku." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Nieznane rozszerzenie pliku: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Wystąpił błąd podczas zapisywania." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Nieznane rozszerzenie pliku." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Wystąpił błąd podczas zapisywania." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Zapisz jako..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Zapisuje bieżące dane do nowego pliku." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Zaznacz wszystko" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1226,16 +1501,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Zamknij" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Rozdziel drogę" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Rozdziela drogę w zaznaczonym węźle." @@ -1245,5 +1520,5 @@ msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1252,5 +1527,5 @@ msgstr[2] "Wybrane węzły nie są w środku żadnej drogi." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1263,9 +1538,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:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 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:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1274,10 +1549,10 @@ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1287,17 +1562,17 @@ "węzły w środku drogi.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1318,42 +1593,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Wybierz przynajmniej:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Jeden węzęł z tagami lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" @@ -1361,5 +1636,5 @@ "tych dróg lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1368,5 +1643,5 @@ "drogę, lub" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1375,5 +1650,5 @@ "niż jedną drogę." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1383,9 +1658,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Rozdzielenie węzła" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1393,5 +1668,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1407,141 +1682,89 @@ msgstr "Cofa ostatnią czynność." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Odznacz wszystko" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Odznacza wszystkie obiekty." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Odznacz wszystko (zaznaczenie)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Odznacz wszystko (anulowanie)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Zaktualizuj dane" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta " -"jakakolwiek warstwa danych?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +msgstr "Aktualizuj zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Wyślij do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Wysyła wszystkie zmiany na serwer OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Obiekty do dodania:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Obiekty do zmiany:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Obiekty do usunięcia:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Czy wysłać te zmiany?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Wyślij zmiany" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Brak zmian do wysłania." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Wysyłanie" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +msgstr "Synchronizuj cały zestaw danych" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1555,17 +1778,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" -msgstr "" +msgstr "Wykryto konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1576,54 +1799,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "Załadunek się nie powiódł.
{0}" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "Załadunek do API OSM się nie udał." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Wysyła wszystkie zmiany na serwer OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, 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 "" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Obiekty do dodania:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Obiekty do zmiany:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1711,42 +1945,54 @@ msgstr "Zmniejsza prędkość odtwarzania." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Pobieranie danych GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Pobrane dane GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "czyste dane GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Pobieranie danych" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Nie zaimportowano danych." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "dane OpenSteetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Pobieranie {0} z {1} (pozostało: {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Przesyłanie danych" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "Podczas pobierania wystąpiły następujące błędy:" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Błędy podczas pobierania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1758,21 +2004,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Tryb kasowania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Usuwanie węzłów lub dróg." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1780,5 +2026,5 @@ msgstr "Tryb: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1788,743 +2034,23 @@ "usuwaniu drogi. Ctrl: usuwa powiązane obiekty." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Rysowanie" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Tworzenie węzłów i dróg." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "zaznaczony" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Dodaj węzeł" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Dodaj węzeł do drogi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -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:502 -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:504 -msgid "Add node into way and connect" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Utwórz nowy węzeł." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Zaznacz węzeł pod kursorem." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Zakończ rysowanie." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Wytłocz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Tworzenie obszarów." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Wytłocz drogę" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Narysuj odcinek aby utworzyć prostokąt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Zaznacz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Wybieranie, przesuwanie i obracanie obiektów" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Zwolnij przycisk myszy aby zakończyć przesuwanie. Ctrl aby scalić z " -"najbliższym węzłem." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Powiększ" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Powiększanie i przesuwanie mapy." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - Ctrl" -"+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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Szukaj..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Szukaj obiektów" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Nie wczytano żadnych danych." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Podaj proszę czego szukać." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "zamień zaznaczenie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "dodaj do zaznaczenia" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "usuń z zaznaczenia" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "uwzględnij wielkość liter" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "wyrażenie regularne" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Bak - 'Bak' gdziekolwiek w nazwie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - brak 'Bak' w nazwie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -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:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - rodzaj obiektu (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id:... - obiekt z podanym ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - wszystkie zmienione obiekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - wszystkie zaznaczone obiekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - wszystkie niekompletne obiekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - wszystkie obiekty bez tagów" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Użyj ( oraz ) aby pogrupować wyrażenia" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Szukaj" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Rozpocznij szukanie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "Nie znaleziono nic szukając ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Brak argumentów dla operator lub." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Brak argumentu dla operatora nie." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Brak nawiasu zamykającego." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontakt {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Pobieranie..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Nie można odczytać \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Błąd przetwarzania adresu URL: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Usuń \"{0}\" dla {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Ustaw {0}={1} dla {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "obiekt" -msgstr[1] "obiekty" -msgstr[2] "obiektów" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Usuń \"{0}\" dla {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Ustaw {0}={1} dla {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Usuń {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Usuń {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Sprzeczne relacje" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Usuń z relacji" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Rozdziel segmenty drogi" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Przenieś" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "węzeł" -msgstr[1] "węzły" -msgstr[2] "węzłów" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Zastosować?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej " -"węzłów powinny zostać uwzględniony aby zachować spójność." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relacja" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Poprzednia rola" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nowa rola" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Stary klucz" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Stara wartość" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nowy klucz" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nowa wartość" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Zastosuj wybrane zmiany" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Porzuć zmiany" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Właściwości " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatyczna korekcja tagów" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Preferencje zostały zapisane na {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Pobranie preferencji z serwera nie powiodło się." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2536,7 +2062,780 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Rysowanie" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Tworzenie węzłów i dróg." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "zaznaczony" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Dodaj węzeł" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Dodaj węzeł do drogi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +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:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Utwórz nowy węzeł." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Zaznacz węzeł pod kursorem." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Kontynuuj drogę od ostatniego węzła." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Zakończ rysowanie." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Wytłocz" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Tworzenie obszarów." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Wytłocz drogę" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Zwolnij przycisk myszy aby zakończyć obracanie." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Narysuj odcinek aby utworzyć prostokąt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Zaznacz" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Wybieranie, przesuwanie i obracanie obiektów" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Więcej elementów" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Zwolnij przycisk myszy aby zakończyć przesuwanie. Ctrl aby scalić z " +"najbliższym węzłem." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Powiększ" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Powiększanie i przesuwanie mapy." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Powiększaj przeciągając lub przez Ctrl+. lub Ctrl+,; przesuwanie - Ctrl" +"+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Szukaj..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Szukaj obiektów" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Podaj proszę czego szukać." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "zamień zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "dodaj do zaznaczenia" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "usuń z zaznaczenia" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "uwzględnij wielkość liter" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "wyrażenie regularne" + +#: ../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 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "name:Bak - 'Bak' gdziekolwiek w nazwie" + +#: ../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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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:100 +msgid "Special targets:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - 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: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 +msgid "modified - all changed objects" +msgstr "modified - wszystkie zmienione obiekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - wszystkie zaznaczone obiekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - wszystkie niekompletne obiekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - wszystkie obiekty bez tagów" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children 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 +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 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Szukaj" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Rozpocznij szukanie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Znaleziono {0} pasujących." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Brak argumentów dla operator lub." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Brak argumentu dla operatora nie." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Brak nawiasu zamykającego." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Załaduj zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontakt {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Pobieranie..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, 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 +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}" +msgstr "Dodaj {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Zmień {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Usuń \"{0}\" dla {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "obiekt" +msgstr[1] "obiekty" +msgstr[2] "obiektów" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Usuń \"{0}\" dla {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Ustaw {0}={1} dla {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Rozwiąż konflikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Nie znaleziono nic szukając ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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:584 +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:402 +msgid "Split way segment" +msgstr "Rozdziel segmenty drogi" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Usuń z relacji" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Przenieś" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "węzeł" +msgstr[1] "węzły" +msgstr[2] "węzłów" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Zastosować?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej " +"węzłów powinny zostać uwzględniony aby zachować spójność." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relacja" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Poprzednia rola" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nowa rola" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Stary klucz" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Stara wartość" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nowy klucz" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nowa wartość" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Zastosuj wybrane zmiany" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Porzuć zmiany" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Właściwości " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatyczna korekcja tagów" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Preferencje zostały zapisane na {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +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 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2565,5 +2864,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2572,27 +2871,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "niekompletne" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Błąd: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Uwaga: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2601,13 +2900,13 @@ msgstr[2] "dróg" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2616,22 +2915,22 @@ msgstr[2] "relacji" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2646,23 +2945,23 @@ msgstr[2] "{0} elementów" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "droga" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "tory kolejowe" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "szlak wodny" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "zagospodarowanie przestrzenne" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2718,5 +3017,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2854,9 +3153,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2873,5 +3167,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "tło" @@ -2882,8 +3176,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2894,5 +3188,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "odwzorowanie Lamberta (Francja)" @@ -2915,22 +3209,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Odczytania zakładek niemożliwe." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Zapisanie zakładek niemożliwe." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../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:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "nieznany" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Nieoczekiwany błąd" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Nie można połączyć z serwerem OSM. Proszę sprawdzić swoje połączenie z " +"Internetem." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Nieznany adres" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Wiadomość dnia jest niedostępna" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- używasz wersji {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Pobieranie wiadomości dnia" @@ -3005,63 +3405,57 @@ msgstr "Hasło" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "użycie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opcje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Wyświetl tę pomoc" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Przywróć domyślne ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Ustaw język" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "przykłady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3069,51 +3463,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktywacja zaktualizowanych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Ładowanie wczesnych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Zapisywanie domyślnych ustawień" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Ładowanie wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3121,21 +3515,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Przełącza widok szkieletowy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Pełny ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Przełącza widok na pełen ekran" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Dźwięk" @@ -3179,53 +3573,68 @@ msgstr "skala" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Długość geograficzna punktu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Nazwa obiektu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Szerokość geograficzna punktu wskazywanego przez kursor." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Namiar (kompasowy) tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Długość nowego, tworzonego odcinka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(brak obiektu)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "warstwa nie jest na liście." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Nawiązywanie połączenia z serwerem OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Błąd podczas przetwarzania" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3247,4 +3656,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Inicjalizacja" @@ -3276,20 +3686,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Etykiety" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3297,47 +3707,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3345,25 +3755,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3400,5 +3810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3409,5 +3819,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3421,5 +3831,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3494,7 +3904,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3568,14 +3977,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3604,10 +4013,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3616,19 +4025,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3637,9 +4046,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3649,13 +4058,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3663,90 +4072,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "usunięto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3756,5 +4165,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3779,12 +4188,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3829,10 +4237,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3841,10 +4249,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3853,5 +4261,5 @@ msgstr "Wartość" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3911,9 +4319,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3921,5 +4329,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3949,42 +4357,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Zapisz pomimo tego" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Rozwiąż konflikty" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4002,96 +4427,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Warstwy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Otwiera listę wszystkich wczytanych warstw." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Usuń zaznaczoną warstwę." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Istnieją niezapisane zmiany. Czy usunąć tę warstwę mimo tego?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Usuń warstwę" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Na pewno usunąć całą warstwę?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informacje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "tak" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Usuń" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Usuń {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Pokaż/Ukryj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Zmienia widocznoś zaznaczonej warstwy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Pokaż/Ukryj Tekst/Ikony" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Zmienia widoczność markerów tekstowych i ikon." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Warstwy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Otwiera listę wszystkich wczytanych warstw." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "droga prywatna" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Usuń zaznaczoną warstwę." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 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/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Warstwy: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Więcej informacji na temat tej funkcji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4101,22 +4560,28 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Ustawienie wartości na pustą usuwa klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Zmienić wartości?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4126,84 +4591,89 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Proszę wybierz klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Proszę wybierz wartość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Właściwości/członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Właściwości zaznaczonych obiektów." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Zmień relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Edycja właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Usuń właściwość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Usuń wybrany klucz ze wszystkich obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Właściwości: {0} / członkostwo: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Właściwości / członkostwo" @@ -4212,63 +4682,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacje" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Otwiera listę wszystkich relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relacje: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Otwiera okno edycji dla zaznaczonej relacji." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Usuwa zaznaczoną relację." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Utwórz nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relacje: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Otwiera okno edycji dla zaznaczonej relacji." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Usuwa zaznaczoną relację." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Bieżące zaznaczenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Otwiera okno z listą zaznaczonych obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Powiększ do wybranych elementów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Odśwież listę zaznaczonych obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Powiększ do zaznaczenia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Zaznaczenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4278,5 +4750,5 @@ msgstr[2] "{0} dróg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4286,5 +4758,5 @@ msgstr[2] "{0} relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4295,5 +4767,10 @@ msgstr "Oderwij panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4301,143 +4778,409 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autorzy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "Liczba obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autorzy: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Pobierany obszar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Usuwa zaznaczoną relację." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Pobierz dane." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relacje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Pobieranie danych" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relacje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Powtarza ostatnio wycofaną czynność." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Przesuń aktualnie zaznaczonych członkół w górę" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "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:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Usuń wszystkie zaznaczone obiekty z relacji" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Usuwa zaznaczoną relację." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Nie połączony" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Sprzeczne relacje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Zapisuje bieżące dane." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Pobierz członków" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zmniejsz" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Zastosuj zmiany" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Podstawowe" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Zajęte przez" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Przesuń w górę" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Przesuń aktualnie zaznaczonych członkół w górę" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Dodaj zaznaczone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Usuń zaznaczone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Usuń wszystkie zaznaczone obiekty z relacji" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Przesuń w dół" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Pobierz członków" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Edytor relacji: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Załaduj zaznaczenie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4447,5 +5190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4455,25 +5198,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Zakładki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Proszę wcześniej podać wybrane współrzędne." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Proszę podać nazwę lokalizacji." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "dodaj do zaznaczenia" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Wybierz najpierw zakładkę." @@ -4507,22 +5247,22 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Źródła i rodzaje danych" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Pobierz jako nową warstwę" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Pobierany obszar" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" "Pobierany obszar jest za duży, prawdopodobnie zostanie odrzucony przez serwer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4530,13 +5270,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Wpisz proszę czego szukać" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Nie można odczytać wyników wyszukiwania z serwera." @@ -4544,5 +5284,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Wpisz nazwę miejsce do odnalezienia:" @@ -4550,5 +5290,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4556,6 +5296,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "nazwa" @@ -4594,6 +5334,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4616,15 +5356,15 @@ msgstr "rodzaj" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "niedaleko" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "powiększenie" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4633,5 +5373,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Mapa \"Slippy\"" @@ -4663,5 +5403,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5403,5 +6149,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5568,59 +6314,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Obrazy dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Wczytaj GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Brak znacznika czasowego dla punktu {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Wczytywanie {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geolokalizowane obrazy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS początek: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS koniec: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "aktualne przesunięcie: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "różnica stref czasowych: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5629,138 +6375,128 @@ msgstr[2] "obrazów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} wewnątrz ścieżki GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synchronizuj zegar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Pliki JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Obraz" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizuj czas z urządzeniem GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Podany czas nie został rozpoznany." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punkt GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Dostosuj rysowanie linii" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Użyj ustawień globalnych." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Rysuj linie pomiędzy punktami na tej warstwie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Wybierz opcje rysowania linii" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Dostosuj kolor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Domyślny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Wybierz kolor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Znaczniki nazwanych punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Nazwane punkty GPS z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importuj dźwięk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Pliki audio Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Markery audio z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importuj obrazki" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5770,5 +6506,5 @@ msgstr[2] "{0} śladów, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5778,5 +6514,5 @@ msgstr[2] "{0} tras, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5786,30 +6522,30 @@ msgstr[2] "{0} punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Nazwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Opis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Okres czasu: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Długość: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Przekształć w warstwę danych" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5819,43 +6555,43 @@ "za niebezpieczne.
Jeśli chcesz wysłać same ślady zajrzyj tu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Przekonwertowany z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Pobierz dane OSM wzdłuż tej ścieżki" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metrów" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km kw." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5866,5 +6602,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" @@ -5872,5 +6608,5 @@ "danymi dźwiękowymi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5878,5 +6614,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5884,47 +6620,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Warstwa danych {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} usuniętych.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5950,5 +6686,5 @@ msgstr[2] "tras" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5957,5 +6693,5 @@ msgstr[2] "punktów" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5965,5 +6701,5 @@ msgstr[2] "trasa z {0} punktami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5973,5 +6709,5 @@ msgstr[2] "{0} składa się z {1} ścieżek" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5992,5 +6728,5 @@ msgstr[2] "znaczników" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6000,29 +6736,29 @@ msgstr[2] "{0} składa się z {1} markerów" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synchronizacja dźwięku" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Musisz włączyć pauzę kiedy usłyszysz wskazówkę do synchronizacji." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Dźwięk zsynchronizowany w punkcie {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Nie można zsynchronizować aktualnie odtwarzanej warstwy." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6030,10 +6766,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Pokaż/Ukryj Tekst/Ikony" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Zmienia widoczność markerów tekstowych i ikon." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6041,5 +6784,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6047,29 +6790,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Nie można utworzyć nowego znacznika dźwiękowego." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(Adres URL był: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Błąd podczas wyświetlania adresu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Ustawienia zaawansowane" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6077,14 +6820,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Ustawiona wartość jest wartością domyślną." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Domyślną wartością jest \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" @@ -6092,13 +6835,13 @@ "użyte)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Proszę wybrać wiersz do edycji" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6106,14 +6849,14 @@ msgstr "Nowa wartość dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Proszę wybrać wiersz do usunięcia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Podaj nowy klucz i jego wartość" @@ -6236,40 +6979,40 @@ msgstr "Kalibracja urządzenia nagrywającego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Kolor" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Styl rysowania {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Warstwa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Wybierz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Wybierz kolor dla {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Ustaw na domyślne" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Domyślne ustawienie dla wszystkich" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Kolory wykorzystywane przez różne obiekty w JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Kolory" @@ -6605,46 +7348,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Konfiguracja dostępnych wtyczek." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Pobierz listę" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Aktualizuj" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Opis symboli" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Ustawienia wyświetlania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6652,29 +7404,29 @@ msgstr "Różnorodne ustawienia, które wpływają na wygląd programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Ustawienia połączenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Ustawienia połączenia z serwerem OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Ustawienia mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Ustawienia audio" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Ustawienia odtwarzacza audio oraz znaczników audio." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6776,59 +7528,61 @@ msgstr "Skrót" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6994,33 +7748,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Więcej informacji na temat tej funkcji" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Dodatkowe atrybuty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Używa szablon \"{0}\" z grupy \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Używa szablon \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "zamknięta droga" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Nieznany typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7031,15 +7785,15 @@ msgstr "Nie można odczytać źródła szablonów: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu {0} nie są wspierane." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7050,18 +7804,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Zmień właściwości" @@ -7072,34 +7826,37 @@ msgstr "Grupa szablonów \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Łączenie z serwerem OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Pobieranie punktów od {0} do {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Pobieranie danych OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "" "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Przygotowywanie danych..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nie można odczytać \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7107,21 +7864,21 @@ msgstr "Pliki GPX" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Znaczniki z {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7137,10 +7894,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7148,48 +7924,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "Pliki NMEA-0183" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Liczba wczytanych współrzędnych: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Nieprawidłowe sekwencje: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Błędy sum kontrolnych: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Nieznane sewkencje: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Zerowe współrzędne: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Import NMEA zakończony powodzeniem" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Import NMEA zakończony niepowodzeniem!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7198,15 +7973,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7214,23 +7989,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Otwieranie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Przygotowywanie..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Wysyłanie..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Przeglądanie katalogu {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7273,9 +8061,4 @@ msgid "Login" msgstr "Logowanie" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Przerywanie..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7326,66 +8109,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Błąd parsowania danych" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Pliki serwera OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Nieznana wersja" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " nie posiada referencji" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Znaleziono tag w" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Niekompletny opis z ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Niedozwolony obiekt z id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7393,46 +8180,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Brak wymaganego atrybutu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Przygotowywanie danych OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Zły format identyfikatora węzła" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Łączenie z serwerem..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7441,5 +8248,18 @@ "Internetem." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7448,16 +8268,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} pozostało. Przesyłanie {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Aktualizuj wtyczki" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Pobierz wtyczki" @@ -7473,5 +8288,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7480,23 +8295,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7507,34 +8322,32 @@ msgstr "Wystąpił błąd we wtyczce {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Uwaga - zażądano załadowania wtyczki {0}. Ta wtyczka nie jest już jednak " "potrzebna." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Nie znaleziono wtyczki: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Wtyczkę ostanio zaktualizowano przed {0} dniami." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7544,21 +8357,21 @@ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Zablokuj wtyczkę" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7568,5 +8381,5 @@ "uprawnienia aby nadpisać istniejące pliki." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7576,10 +8389,10 @@ "\"." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7588,9 +8401,9 @@ "błędu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Czy ta wtyczka ma zostać zablokowana?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7600,27 +8413,23 @@ "wyładować wtyczkę." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym problemie " -"autorom JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informacje" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Nie znaleziono informacji o wtyczce." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "brak opisu" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7630,13 +8439,18 @@ msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Nie znaleziono informacji o wtyczce." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Wszystkie zainstalowane wtyczki są aktualne." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7649,9 +8463,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Pobierz brakujące wtyczki" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7664,57 +8478,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "nieznany" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Wersja {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Wtyczka dostarczana wraz z JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Błąd podczas wczytywania pliku informacyjnego wtyczki: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "To znajduje się za końcem nagrania." -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Błąd odtwarzania dźwięku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Nic nie rób" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Zgłoś błąd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7728,14 +8520,14 @@ "z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Nieoczekiwany błąd" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Proszę zgłosić bład pod adresem {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7743,5 +8535,5 @@ "błędną sytuację." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7751,17 +8543,34 @@ "błędu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Upewnij się, żeby załączyć następujące informacje:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Tekst już został skopiowany do schowka.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Nie pokazuj ponownie" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7774,5 +8583,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7782,5 +8591,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7791,13 +8600,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7805,21 +8629,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7827,74 +8651,75 @@ msgstr "Wyślij ślady" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Opis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Łączenie..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Błąd podczas wysyłania" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Wysyłanie GPX zakończone sukcesem" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Nie podano opisu. Proszę podać jakiś opis." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nie wybrano żadnej warstwy GPX. Nie można wysłać sladu." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Nie podano nazwy użytkownika." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Nie podano hasła." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Wysyłanie śladu GPX" @@ -7964,33 +8789,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Przeglądanie katalogu {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8010,15 +8836,15 @@ msgstr "Pliki GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Błąd podczas przetwarzania {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8027,34 +8853,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Brak daty" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Otwórz inne zdjęcie" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8064,69 +8890,69 @@ "Proszę użyć wybranego formatu." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Nieprawidłowa data" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Scieżka GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Strefa czasowa: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Aktualizuj pozycję dla: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Wszystkie obrazy" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8135,9 +8961,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Nieprawidłowa strefa czasowa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8146,65 +8972,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Ślad GPX wczytany" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8212,13 +9038,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8240,5 +9066,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" @@ -8261,6 +9087,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8426,22 +9252,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8449,18 +9275,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8574,6 +9400,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Pusta warstwa" @@ -8602,5 +9428,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8609,14 +9435,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8704,4 +9530,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Nie wczytano żadnych danych." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8712,9 +9543,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8835,30 +9666,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Błąd podczas usuwania danych." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Połączenie nie powiodło się." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8867,14 +9698,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "Import" @@ -8965,40 +9796,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -9007,26 +9838,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9111,7 +9934,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "woda" @@ -9256,9 +10079,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9502,18 +10325,18 @@ msgstr "Nieznany stan problemu" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9540,33 +10363,33 @@ msgstr "Ścieżka do programu Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9575,28 +10398,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9860,4 +10683,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10104,33 +10948,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10162,6 +11006,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Błędy poprawności" @@ -10171,10 +11015,10 @@ msgstr "Sprawdzanie poprawności przebiegło pomyślnie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Siatka" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10263,23 +11107,15 @@ msgstr "Przeprowadza sprawdzanie poprawności danych" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Otwiera okno z informacją o rezultatach sprawdzania poprawności" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Pokaż problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Zweryfikuj" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Weryfikuje bieżące zaznaczenie lub całość danych." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10352,22 +11188,22 @@ msgstr "Przecinające się drogi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Powielone węzły drogi." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Sprawdza drogi z identycznymi, kolejnymi węzłami." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Powielone węzły drogi" @@ -10441,23 +11277,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10466,7 +11302,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10474,78 +11310,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "DO POPRAWKI" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10553,82 +11391,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10773,7 +11611,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "budynek" @@ -10787,5 +11625,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "obszar" @@ -10819,10 +11657,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10876,8 +11714,32 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10888,10 +11750,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10940,14 +11802,14 @@ msgstr "Pomoc wtyczki WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10958,26 +11820,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10985,5 +11847,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10993,5 +11855,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11002,107 +11864,107 @@ "Może to spowodować powstanie błędnych współrzędnych." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Zmiana rozdzielczości" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Błędny format pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Ustawienia wtyczki WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Nazwa w menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Adres serwera WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "URL WMS (domyślny)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11207,11 +12069,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11221,10 +12088,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11232,5 +12099,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11240,5 +12107,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11248,15 +12115,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11264,5 +12131,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11270,5 +12137,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11277,15 +12144,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11294,10 +12161,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11306,15 +12173,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11324,10 +12191,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11336,5 +12203,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11343,5 +12210,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11349,11 +12216,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12508,58 +13382,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12573,6 +13395,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "autostrada" @@ -12598,6 +13420,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "droga ekspresowa" @@ -12623,6 +13445,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "droga krajowa" @@ -12648,6 +13470,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "droga wojewódzka" @@ -12661,5 +13483,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "droga powiatowa" @@ -12677,5 +13499,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "droga lokalna" @@ -12709,6 +13531,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "droga serwisowa" @@ -12735,6 +13557,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "w budowie" @@ -12784,5 +13606,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rondo" @@ -13761,5 +14583,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "marsze" @@ -14400,5 +15222,5 @@ #: build/trans_presets.java:1468 msgid "Railway Platform" -msgstr "" +msgstr "Platforma kolejowa" #. item @@ -14407,5 +15229,5 @@ #: build/trans_presets.java:1471 msgid "Edit Railway Platform" -msgstr "" +msgstr "Edytuj platformę kolejową" #. item "Public Transport/Railway Platform" label "Edit Railway Platform" @@ -14447,5 +15269,5 @@ #: build/trans_presets.java:1491 msgid "Bus Station" -msgstr "dworzec autobusowa" +msgstr "dworzec autobusowy" #. item @@ -15490,27 +16312,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -18349,7 +19171,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18419,7 +19241,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18445,5 +19267,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -18934,13 +19756,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "przestarzały" @@ -18982,5 +19804,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19200,4 +20022,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "sporty motorowe" + #. color tertiary #. @@ -19232,6 +20116,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "ulica" @@ -19287,7 +20171,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19343,8 +20227,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19365,5 +20249,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19377,5 +20261,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19396,5 +20280,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19409,5 +20293,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19422,5 +20306,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19434,5 +20318,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "strumień" @@ -19446,5 +20330,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "Dok" @@ -19472,5 +20356,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akwedukt" @@ -19638,13 +20522,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19706,7 +20590,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19729,10 +20613,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19768,7 +20652,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19813,6 +20697,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19826,5 +20710,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "Terminal" @@ -19846,5 +20730,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19858,5 +20742,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19904,7 +20788,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19921,5 +20805,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19934,5 +20818,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19947,5 +20831,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19960,5 +20844,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19973,5 +20857,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19986,5 +20870,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20089,12 +20973,12 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" -msgstr "" +msgstr "energia" #. color manmade @@ -20106,7 +20990,7 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" -msgstr "" +msgstr "nabrzeże" #. color pier @@ -20118,5 +21002,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20244,14 +21128,14 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" -msgstr "" +msgstr "wypoczynek" #. color leisure @@ -20263,5 +21147,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20333,10 +21217,10 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" -msgstr "" +msgstr "udogodnienie" #. color amenity @@ -20436,10 +21320,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20825,22 +21709,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20872,6 +21756,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20932,10 +21816,10 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" -msgstr "" +msgstr "zdrowie" #. color deprecated @@ -21286,26 +22170,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "sklep" @@ -21377,8 +22261,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21528,11 +22412,11 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" -msgstr "" +msgstr "turystyka" #. color tourism @@ -21602,10 +22486,10 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" -msgstr "" +msgstr "historia" #. color historic @@ -21674,8 +22558,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21689,5 +22573,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "kamieniołom" @@ -21701,5 +22585,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "Wysypisko smieci" @@ -21721,5 +22605,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "Basen" @@ -21733,5 +22617,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "las" @@ -21745,5 +22629,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21766,5 +22650,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21778,5 +22662,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "Teren przemysłowy" @@ -21790,5 +22674,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21802,5 +22686,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21814,5 +22698,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "Teren kolejowy" @@ -21869,7 +22753,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "Teren wojskowy" @@ -21883,5 +22767,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cmentarz" @@ -21894,5 +22778,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "szczyt" @@ -21907,5 +22791,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "lodowiec" @@ -21919,5 +22803,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "wulkan" @@ -21972,8 +22856,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -21987,5 +22871,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21999,7 +22883,7 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" -msgstr "" +msgstr "zdrowie" #. color heath @@ -22011,5 +22895,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "Las naturalny" @@ -22023,5 +22907,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "błoto" @@ -22035,5 +22919,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "plaża" @@ -22111,10 +22995,10 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" -msgstr "" +msgstr "droga" #. color route @@ -22160,7 +23044,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "granica" @@ -22302,10 +23186,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "Miejsce" @@ -22353,6 +23237,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adres" @@ -22502,5 +23386,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Nienazwana niesklasyfikowana droga" #. way : W : highway == unclassified && name != * @@ -22618,15 +23502,15 @@ #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -22636,5 +23520,5 @@ #: build/trans_wms.java:20 msgid "Streets NRW Geofabrik.de" -msgstr "" +msgstr "Ulice NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? @@ -22642,38 +23526,76 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& #: build/trans_wms.java:23 msgid "Terraserver Urban" -msgstr "" +msgstr "Terraserver Urban" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później." + +#~ msgid "API initialization failed" +#~ msgstr "Inicjalizacja API nie powiodła się." + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta " +#~ "jakakolwiek warstwa danych?" + +#~ msgid "No data" +#~ msgstr "Brak danych" + +#~ msgid "Update failed" +#~ msgstr "Aktualizacja się nie powiodła" + +#~ msgid "Layers: {0}" +#~ msgstr "Warstwy: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym " +#~ "problemie autorom JOSM." + +#~ msgid "Validate" +#~ msgstr "Zweryfikuj" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Object" +#~ msgstr "Obiekt" + +#~ msgid "true" +#~ msgstr "prawda" + +#~ msgid "false" +#~ msgstr "fałsz" + +#~ msgid "Change" +#~ msgstr "Zmień" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach" + +#~ msgid "unnamed" +#~ msgstr "bez nazwy" #~ msgid "Data Layer" #~ msgstr "Warstwa danych" -#~ msgid "Uploading data" -#~ msgstr "Przesyłanie danych" - #~ msgid "Not implemented yet." #~ msgstr "Jeszcze nie zaimplementowane." -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Rozwiąż konflikty" - -#~ msgid "There were conflicts during import." -#~ msgstr "Wystąpiły konfikty podczas importowania." - -#~ msgid "Object" -#~ msgstr "Obiekt" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} obiekt ma konflikt:" -#~ msgstr[1] "{0} obiekty mają konflikt:" -#~ msgstr[2] "{0} obiektów ma konflikt:" - #~ msgid "my version:" #~ msgstr "moja wersja:" @@ -22682,134 +23604,54 @@ #~ msgstr "ich wersja:" -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Login (adres email) konta OSM" +#~ msgid "Cannot connect to server." +#~ msgstr "Nie można połączyć się z serwerem." + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "Revert" +#~ msgstr "Wycofaj" #~ msgid "OSM username (email)" #~ msgstr "Użytkownik OSM (email)" -#~ msgid "Unknown host" -#~ msgstr "Nieznany adres" +#~ msgid "Contacting the OSM server..." +#~ msgstr "Nawiązywanie połączenia z serwerem OSM..." #~ msgid "position" #~ msgstr "pozycja" -#~ msgid "different" -#~ msgstr "różne" - -#~ msgid "true" -#~ msgstr "prawda" - -#~ msgid "false" -#~ msgstr "fałsz" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach" - -#~ msgid "Change" -#~ msgstr "Zmień" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę" - -#~ msgid "Revert" -#~ msgstr "Wycofaj" - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w " -#~ "liście historia poleceń." - -#~ msgid "Rotate" -#~ msgstr "Obrót" +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Charge" +#~ msgstr "Opłata" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):" + +#~ msgid "Aborting..." +#~ msgstr "Przerywanie..." + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin wymaga aktualizacji JOSM: {0}." #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)" -#~ msgid "Error parsing server response." -#~ msgstr "Błąd podczas parsowania odpowiedzi serwera." - -#~ msgid "Cannot connect to server." -#~ msgstr "Nie można połączyć się z serwerem." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać." - -#~ msgid "Tagging preset source" -#~ msgstr "Źródło szablonów" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować " -#~ "po chwili." - -#~ msgid "Commit comment" -#~ msgstr "Komentarz zmiany" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM." -#~ msgstr[1] "" -#~ "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM." -#~ msgstr[2] "" -#~ "{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Nie można pobrać wtyczki {0} z {1}" - -#~ msgid "Navigation" -#~ msgstr "Nawigacja" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "Charge" -#~ msgstr "Opłata" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Serwer nie wspiera wersjonowania" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin wymaga aktualizacji JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Wtyczka już istnieje" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Błąd podczas usuwania wtyczki: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Niektóre z węzłów są (prawie) w jednej linii" - -#~ msgid "Drawbridge" -#~ msgstr "Most zwodzony" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?" +#~ msgid "Add Selected" +#~ msgstr "Dodaj zaznaczone" #~ msgid "" @@ -22823,6 +23665,19 @@ #~ "haseł" -#~ msgid "Portcullis" -#~ msgstr "brona" +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować " +#~ "po chwili." + +#~ msgid "Server does not support changesets" +#~ msgstr "Serwer nie wspiera wersjonowania" + +#~ msgid "Error parsing server response." +#~ msgstr "Błąd podczas parsowania odpowiedzi serwera." + +#~ msgid "There were conflicts during import." +#~ msgstr "Wystąpiły konfikty podczas importowania." #~ msgid "" @@ -22832,4 +23687,7 @@ #~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać " #~ "automatycznie." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Nie można pobrać wtyczki {0} z {1}" #~ msgid "" @@ -22846,4 +23704,32 @@ #~ "Proszę nie wysyłać żadnych danych po tej wiadomości." +#~ msgid "Rotate" +#~ msgstr "Obrót" + +#~ msgid "Drawbridge" +#~ msgstr "Most zwodzony" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Błąd podczas usuwania wtyczki: {0}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikty: {0}" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n" + +#~ msgid "Plugin already exists" +#~ msgstr "Wtyczka już istnieje" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM." +#~ msgstr[1] "" +#~ "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM." +#~ msgstr[2] "" +#~ "{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM." + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -22857,9 +23743,30 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikty: {0}" - -#~ msgid "viaduct" -#~ msgstr "Wiadukt" +#~ msgid "Commit comment" +#~ msgstr "Komentarz zmiany" + +#~ msgid "different" +#~ msgstr "różne" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Niektóre z węzłów są (prawie) w jednej linii" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Login (adres email) konta OSM" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Portcullis" +#~ msgstr "brona" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?" #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -22867,12 +23774,60 @@ #~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych" +#~ msgid "Remove Selected" +#~ msgstr "Usuń zaznaczone" + +#~ msgid "Basic" +#~ msgstr "Podstawowe" + #~ msgid "sports" #~ msgstr "Sklep sportowy" -#~ msgid "Delete and Download" -#~ msgstr "Usuń i pobierz" - -#~ msgid "Solve Conflict" -#~ msgstr "Rozwiąż konflikt" +#~ msgid "viaduct" +#~ msgstr "Wiadukt" + +#~ msgid "Navigation" +#~ msgstr "Nawigacja" + +#~ msgid "Occupied By" +#~ msgstr "Zajęte przez" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Edytor relacji: {0}" + +#~ msgid "Move Up" +#~ msgstr "Przesuń w górę" + +#~ msgid "Move Down" +#~ msgstr "Przesuń w dół" + +#~ msgid "Tagging preset source" +#~ msgstr "Źródło szablonów" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w " +#~ "liście historia poleceń." + +#~ msgid "Edit Drawbridge" +#~ msgstr "Edycja mostu zwodzonego" + +#~ msgid "Edit Portcullis" +#~ msgstr "Edycja brony" + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "" +#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku " +#~ "lub po polsku." #~ msgid "" @@ -22883,26 +23838,15 @@ #~ "przesłane elementy posiadają historię." +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} obiekt ma konflikt:" +#~ msgstr[1] "{0} obiekty mają konflikt:" +#~ msgstr[2] "{0} obiektów ma konflikt:" + +#~ msgid "Delete and Download" +#~ msgstr "Usuń i pobierz" + #~ msgid "" #~ "This action will require {0} individual download requests. Do you wish to " #~ "continue?" #~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?" - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Podczas pobierania wystąpiły następujące błędy:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Edycja mostu zwodzonego" - -#~ msgid "Edit Portcullis" -#~ msgstr "Edycja brony" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "" -#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Brak strony pomocy. Możesz ją utworzyć po angielsku " -#~ "lub po polsku." Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 16826) +++ /applications/editors/josm/i18n/po/ro.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-13 06:45+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-14 17:39+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-07-14 15:28+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -23,23 +23,100 @@ "X-Poedit-SourceCharset: utf-8\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Se creează interfața grafică" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "_Ajutor" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator." -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Eroare" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -47,56 +124,59 @@ "server." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Modificări nesalvate" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Salvez şi Ies" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Renunţ şi Ies" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -105,32 +185,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Renunţă" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Se ignoră URL-ul prost format: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Avertisment" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Se ingoră fişierul URL prost format: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "NECUNOSCUT" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Despre" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Afişează ecranul cu informaţii despre program." @@ -138,10 +278,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -149,5 +289,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -156,19 +296,19 @@ msgstr "Versiune {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Ultima modificare la {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Versiunea Java {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Pagina pricipală" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Rapoarte erori" @@ -178,37 +318,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Informaţii" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Citeşte-mă" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revizia" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Contribuţii" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Module" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Despre JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Fişierul nu a putut fi găsit." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -217,5 +361,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,12 +367,5 @@ "încărcate." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Avertisment" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -237,7 +374,34 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Vă rog selectaţi rândul care va fi şters." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Şterge stratul selectat." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +msgid "Merge" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Adaugă Nod..." @@ -249,14 +413,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -264,57 +430,57 @@ msgstr "Editează: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Introdu coordonatele pentru noul nod." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Foloseşte grade zecimale" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valorile negative denotă emisfera Vestică/Sudică" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitudine" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitudine" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Aliniază Nodurile în Cerc" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Mută nodurile selectate într-un cerc." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -330,25 +496,58 @@ msgstr "Unealtă: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "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:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Aliniază Nodurile în Linie" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Mută nodurile selectate într-o linie." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Te rog selectează cel puţin trei noduri." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -357,18 +556,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Inițializarea API-ului a eșuat" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -377,5 +568,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -384,46 +575,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "date" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "strat" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selecţie" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "descărcare" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Apropie la {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Apropie vederea la {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -433,30 +624,30 @@ msgstr "Vedere: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Selectează te rog cel puţin două căi pentru a le combina." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -464,13 +655,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Combină oricum" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Schimbă direcţiile?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -480,10 +671,10 @@ "din ele?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Inversează şi Combină" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -491,20 +682,20 @@ msgstr "Introdu valori pentru toate conflictele." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Rezolvă Conflictele" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Combină {0} căi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -521,23 +712,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +msgid "Those nodes are not in a circle. Aborting." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -545,87 +736,121 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Şterge" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Suprascrie" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Descarc datele OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Descarcă hărţi de la serverul OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +msgid "Conflicts during download" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -645,5 +870,5 @@ msgstr "Părăsiţi aplicaţia." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -651,58 +876,73 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportă datele într-un fişier GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nimic de exportat. Obţineţi mai întâi nişte date." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "descrierea pistei gps" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Adaugă informaţii despre autor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Nume real" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Drepturi de autor (adresă)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Predefinit" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "An drepturi de autor" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Cuvinte cheie" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Opţiuni exportare" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -711,25 +951,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Eroare" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Alegeţi o licenţă predefinită" @@ -739,46 +959,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Editare" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Reîncarcă" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Se pot edita doar paginile din ajutorul JOSM online" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -814,30 +1037,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Redenumire strat" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Salvează datele curente într-un fişier nou." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -845,68 +1078,78 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selecţie" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +msgid "Merge the currently selected primitives into another layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 +#, java-format +msgid "Move objects {0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 +msgid "down" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 +msgid "left" +msgstr "" + +#. dir == Direction.RIGHT) { #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 -#, java-format -msgid "Move objects {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 -msgid "down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 -msgid "left" -msgstr "" - -#. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 msgid "right" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nu pot muta obiecte în afara lumii." @@ -914,5 +1157,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "" @@ -922,26 +1165,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "fără nume" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Deschide un fişier." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nu am putut citi \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -970,41 +1204,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "" @@ -1020,11 +1254,11 @@ 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:78 +msgid "Paste Tags" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1052,16 +1286,21 @@ msgstr "Refă ultima acţiune anulată." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Redenumire strat" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Şi redenumeşte şi fişierul" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Nu am putut redenumi fişierul \"{0}\"." @@ -1075,9 +1314,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "" @@ -1085,17 +1324,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Salvează" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Salvează datele curente." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1103,25 +1344,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Nu este nici un document deschis, nu este nimic de salvat." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Document gol" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Conflicte" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1131,54 +1372,75 @@ "ca şi cum aţi refuzat totul. Continui?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, java-format +msgid "Could not back up file. Exception is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Extensie fişier necunoscută : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Extensie fişier necunoscută." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, java-format +msgid "An error occurred while saving. Error is: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Salvează datele curente într-un fişier nou." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1209,16 +1471,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "" @@ -1228,5 +1490,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1234,5 +1496,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1244,9 +1506,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1254,10 +1516,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1265,17 +1527,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1296,56 +1558,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1355,9 +1617,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1365,5 +1627,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1379,139 +1641,89 @@ msgstr "Anulează ultima acţiune." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Despre JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Trimite toate schimbările la serverul OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Obiecte de adăugat:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Obiecte de modificat:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Obiecte de şters:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Nimic de transmis. Mai întâi obţineţi nişte date." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Nu sunt schimbări de transmis." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1525,17 +1737,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1546,53 +1758,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Trimite toate schimbările la serverul OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Obiecte de adăugat:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Obiecte de modificat:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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 "" @@ -1681,42 +1904,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Descarc date GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Date GPS neprelucrate" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Descarc date" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Nu au fost importate date." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Date OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Transmit datele" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1728,21 +1963,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1750,5 +1985,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1756,735 +1991,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "selectat" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Adaugă nod" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Selectaţi" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Apropie" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Caută obiecte" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Vă rog introduceţi un şir de căutat" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "Înlocuieşte selecţia" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "adaugă la selecţie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "elimină din selecţie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Căutare" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Contactez {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Descarc..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "obiect" -msgstr[1] "obiecte" -msgstr[2] "de obiecte" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Mută" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nod" -msgstr[1] "noduri" -msgstr[2] "de noduri" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2496,7 +2019,771 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "selectat" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "Adaugă nod" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Selectaţi" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Apropie" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Caută obiecte" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Vă rog introduceţi un şir de căutat" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "Înlocuieşte selecţia" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "adaugă la selecţie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "elimină din selecţie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" + +#: ../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 "" + +#: ../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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +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 +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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Căutare" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Încarcă selecţia" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Contactez {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Descarc..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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/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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "obiect" +msgstr[1] "obiecte" +msgstr[2] "de obiecte" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Rezolvă Conflictele" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, java-format +msgid "Add conflict for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "" + +#: ../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 +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:584 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +msgid "Delete confirmation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Mută" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nod" +msgstr[1] "noduri" +msgstr[2] "de noduri" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2525,5 +2812,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2532,27 +2819,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2561,13 +2848,13 @@ msgstr[2] "de căi" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2575,22 +2862,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2604,23 +2891,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2675,5 +2962,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2811,9 +3098,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2830,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "fundal" @@ -2839,8 +3121,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2851,5 +3133,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "" @@ -2872,22 +3154,126 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Nu am putut citi semnele de carte." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Nu am putut scrie semnele de carte." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "necunoscut" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Excepţie netratată" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Gazdă necunoscută" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "" @@ -2962,62 +3348,57 @@ msgstr "Parolă" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "utilizare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "opţiuni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Arată acest ajutor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Argument geometrie unix standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Descarcă perimetrul selectat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Descarcă perimetrul selectat ca date gps neprelucrate" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Selectează cu căutarea dată" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Restabileşte preferinţele implicite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "exemple" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3028,51 +3409,51 @@ "că aţi încărcat date înainte de --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "În loc de --download= puteţi specifica osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Unelte" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3080,21 +3461,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "" @@ -3138,52 +3519,67 @@ msgstr "scală" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "stratul nu este în listă." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Contactez serverul OSM..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Eroare la prelucrare" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" msgstr "" @@ -3206,4 +3602,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "" @@ -3235,20 +3632,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3256,47 +3653,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3304,25 +3701,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3359,5 +3756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3368,5 +3765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3380,5 +3777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3453,7 +3850,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3527,14 +3923,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3563,10 +3959,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3575,19 +3971,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3596,9 +3992,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3608,13 +4004,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3622,90 +4018,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "şters" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3715,5 +4111,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3738,12 +4134,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3788,10 +4183,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3800,10 +4195,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3812,5 +4207,5 @@ msgstr "Valoare" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3870,9 +4265,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3880,5 +4275,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3910,6 +4305,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -3918,36 +4313,53 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Combină oricum" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Rezolvare conflicte" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3965,96 +4377,125 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Straturi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Şterge stratul selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" +msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, java-format +msgid "Do you really want to delete layer ''{0}''?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Contribuţii" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +msgid "No" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Şterge" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, java-format +msgid "Deleting layer {0} of {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Arată/Ascunde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Comută starea vizibilă a stratului selectat." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Straturi" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +msgid "Activate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Şterge stratul selectat." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +msgid "Merge this layer into another layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Mută stratul selectat un rând în sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Mută stratul selectat un rând în jos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +msgid "Information about layer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4063,22 +4504,28 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Schimb valorile?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4087,85 +4534,90 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Vă rog selectaţi o cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Vă rog selectaţi o valoare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 +msgid "Change relation" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 -msgid "Change relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #, java-format msgid "Really delete selection from relation {0}?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Adaugă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Editează valoarea cheii selectata pentru toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Şterge cheia selectată din toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "" @@ -4174,63 +4626,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Selecţia curentă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Deschide o fereastra cu o listă de selecţie." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Reîncarcă lista de selecţii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Selecţie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4239,5 +4693,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4246,5 +4700,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4255,148 +4709,413 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +msgid "Download All Children" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +msgid "Download selected relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Încarcă selecţia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +msgid "Relation is deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Descarc date" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +msgid "Child Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Refă ultima acţiune anulată." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista." + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Şterge stratul selectat." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Conflict" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Salvează datele curente." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Apropie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +msgid "Zoom to primitive the first selected member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Încarcă selecţia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4406,5 +5125,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4414,25 +5133,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Semne de carte" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Vă rog întâi introduceţi coordonatele dorite." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Vă rog introduceţi un nume pentru locaţie." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "adaugă la selecţie" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Selectaţi întâi un semn de carte." @@ -4465,34 +5181,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "" @@ -4500,5 +5216,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "" @@ -4506,5 +5222,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4512,6 +5228,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "" @@ -4550,6 +5266,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4572,15 +5288,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4589,5 +5305,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4619,5 +5335,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5359,5 +6081,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5524,59 +6246,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Imagini pentru {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Nu există timp pentru punctul {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Nu am găsit imagini cu mărci de timp citibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Citesc {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Imagini geoetichetate" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Start GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Sfârşit GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "diferentă curentă: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "diferenţă zonă de timp: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5585,138 +6307,128 @@ msgstr[2] "de imagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} în urmă." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Sincronizare ceas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Imagine JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Nu există timp EXIF în fişierul \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Imagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizare timp cu unitatea GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Timpul introdus nu a putut fi interpretat." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "punct gps" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Personalizează trasarea liniilor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Utilizează opţiunile globale." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Trasează linii între puncte pentru acest strat." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Nu trasa linii între puncte pentru acest strat." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Selectaţi opţiunile pentru trasarea liniilor" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Personalizează culoarea" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Implicit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Alegeţi o culoare" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importă imagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5725,5 +6437,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5732,5 +6444,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5739,30 +6451,30 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Converteşte la strat de date" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5770,43 +6482,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5815,9 +6527,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5825,5 +6537,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5831,47 +6543,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} şters.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5897,5 +6609,5 @@ msgstr[2] "de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5904,5 +6616,5 @@ msgstr[2] "de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5912,5 +6624,5 @@ msgstr[2] "o urmă cu {0} de puncte" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5920,5 +6632,5 @@ msgstr[2] "{0} este format din {1} de urme" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5938,5 +6650,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5945,29 +6657,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5975,10 +6687,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5986,5 +6705,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -5992,29 +6711,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6022,26 +6741,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Vă rog selectaţi rândul care va fi editat." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6049,14 +6768,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Vă rog selectaţi rândul care va fi şters." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "" @@ -6179,40 +6898,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Culoare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Alegeţi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Alegeţi o culoare pentru {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Culori utilizate de diferite obiecte în JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Culori" @@ -6542,46 +7261,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Configurări afişare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6591,29 +7318,29 @@ "program." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Configurări conexiune" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Opţiuni hartă" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect." @@ -6716,59 +7443,61 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Şterge sursele selectate din listă." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6934,33 +7663,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6971,15 +7700,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -6990,18 +7719,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -7012,74 +7741,96 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Descarc punctele {0} până la {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 +#. SAXException does not chain correctly +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgid "NullPointerException, possibly some missing tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 +msgid "Preparing data..." +msgstr "Pregătesc datele..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nu am putut citi \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 +#, java-format +msgid "Markers from {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#, java-format +msgid "File \"{0}\" does not exist" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#, java-format +msgid "Parsing file \"{0}\" failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 +msgid "Parse error: invalid document structure for gpx document" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#, java-format +msgid "no primitive with id {0} in local dataset. Can't infer primitive type" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 msgid "Downloading OSM data..." msgstr "Descarc datele OSM..." -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 -msgid "Preparing data..." -msgstr "Pregătesc datele..." - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../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 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 -#, java-format -msgid "Markers from {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#, java-format -msgid "File \"{0}\" does not exist" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 -#, java-format -msgid "Parsing file \"{0}\" failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 -msgid "Parse error: invalid document structure for gpx document" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 -#, java-format -msgid "no primitive with id {0} in local dataset. Can't infer primitive type" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7087,48 +7838,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "" -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7137,15 +7887,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7153,22 +7903,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, java-format +msgid "Starting retry {0} of {1}." msgstr "" @@ -7212,9 +7975,4 @@ msgid "Login" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Anulez..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7265,66 +8023,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Eroare la prelucrare." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Versiune necunoscută" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Obiect ilegal cu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7332,51 +8094,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7385,16 +8180,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7408,5 +8198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7415,23 +8205,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7442,32 +8232,30 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, 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 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Modulul nu a fost găsit: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7475,21 +8263,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7497,5 +8285,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7503,19 +8291,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7523,25 +8311,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Adaugă informaţii despre autor" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7550,13 +8336,18 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7566,9 +8357,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7578,57 +8369,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "necunoscut" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Nu fă nimic" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Raportează eroarea" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7638,18 +8407,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Excepţie netratată" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7657,17 +8426,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7677,5 +8462,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7683,5 +8468,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7690,13 +8475,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7704,21 +8504,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7726,74 +8526,75 @@ msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "" @@ -7859,33 +8660,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7905,15 +8707,15 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Eroare la prelucrarea {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7922,34 +8724,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7957,69 +8759,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8028,9 +8830,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8039,65 +8841,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8105,13 +8907,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8133,5 +8935,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -8154,6 +8956,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8317,22 +9119,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8340,18 +9142,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8464,6 +9266,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "" @@ -8492,5 +9294,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8499,14 +9301,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8594,4 +9396,9 @@ msgstr "" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8602,9 +9409,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8725,30 +9532,30 @@ msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8757,14 +9564,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 +msgid "Globalsat Import" +msgstr "" + +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 +msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 -msgid "Globalsat Import" -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 -msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 msgid "Import" msgstr "" @@ -8855,40 +9662,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -8897,26 +9704,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9001,7 +9800,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "" @@ -9146,9 +9945,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9388,18 +10187,18 @@ msgstr "" +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +msgid "Open Visible..." +msgstr "" + #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 -msgid "Open Visible..." -msgstr "" - -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open only files that are visible in current view." msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9424,33 +10223,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9459,28 +10258,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9744,4 +10543,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -9988,33 +10808,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10046,6 +10866,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10055,10 +10875,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10145,22 +10965,14 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." msgstr "" @@ -10232,22 +11044,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10320,23 +11132,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10345,7 +11157,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10353,78 +11165,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10432,82 +11246,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10652,7 +11466,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "" @@ -10666,5 +11480,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10698,10 +11512,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10755,7 +11569,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10767,10 +11605,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10819,14 +11657,14 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10837,26 +11675,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10864,5 +11702,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10872,5 +11710,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10879,107 +11717,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11084,11 +11922,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11098,10 +11941,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11109,5 +11952,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11117,5 +11960,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11125,15 +11968,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11141,5 +11984,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11147,5 +11990,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11154,15 +11997,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11171,10 +12014,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11183,15 +12026,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11201,10 +12044,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11213,5 +12056,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11220,5 +12063,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11226,11 +12069,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12385,58 +13235,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12450,6 +13248,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12475,6 +13273,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "" @@ -12500,6 +13298,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "" @@ -12525,6 +13323,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "" @@ -12538,5 +13336,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "" @@ -12554,5 +13352,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12586,6 +13384,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12612,6 +13410,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12661,5 +13459,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "" @@ -13638,5 +14436,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15367,27 +16165,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "" @@ -18226,7 +19024,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18296,7 +19094,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18322,5 +19120,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -18811,13 +19609,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -18859,5 +19657,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19077,4 +19875,65 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +msgid "motorroad" +msgstr "" + #. color tertiary #. @@ -19109,6 +19968,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19164,7 +20023,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19220,8 +20079,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19242,5 +20101,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19254,5 +20113,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19273,5 +20132,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19286,5 +20145,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19299,5 +20158,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19311,5 +20170,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19323,5 +20182,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19349,5 +20208,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19515,13 +20374,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19583,7 +20442,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19606,10 +20465,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19645,7 +20504,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19690,6 +20549,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19703,5 +20562,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19723,5 +20582,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19735,5 +20594,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19781,7 +20640,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19798,5 +20657,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19811,5 +20670,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19824,5 +20683,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19837,5 +20696,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19850,5 +20709,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19863,5 +20722,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -19966,10 +20825,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -19983,5 +20842,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -19995,5 +20854,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20121,12 +20980,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20140,5 +20999,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20210,8 +21069,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20313,10 +21172,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20702,22 +21561,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20749,6 +21608,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20809,8 +21668,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21163,26 +22022,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21254,8 +22113,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "" @@ -21405,9 +22264,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "" @@ -21479,8 +22338,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21551,8 +22410,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21566,5 +22425,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21578,5 +22437,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21598,5 +22457,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21610,5 +22469,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "" @@ -21622,5 +22481,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21643,5 +22502,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21655,5 +22514,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21667,5 +22526,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21679,5 +22538,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21691,5 +22550,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21746,7 +22605,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21760,5 +22619,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21771,5 +22630,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21784,5 +22643,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "" @@ -21796,5 +22655,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "" @@ -21849,8 +22708,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -21864,5 +22723,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21876,5 +22735,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -21888,5 +22747,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -21900,5 +22759,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -21912,5 +22771,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "" @@ -21988,8 +22847,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22037,7 +22896,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22179,10 +23038,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22230,6 +23089,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22526,75 +23385,27 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Strat de date" - -#~ msgid "Uploading data" -#~ msgstr "Transmit datele" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu." + +#~ msgid "API initialization failed" +#~ msgstr "Inițializarea API-ului a eșuat" + +#~ msgid "Aborting..." +#~ msgstr "Anulez..." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista" + +#~ msgid "Revert" +#~ msgstr "Anulează" + +#~ msgid "Object" +#~ msgstr "Obiect" + +#~ msgid "Date" +#~ msgstr "Dată" #~ msgid "Not implemented yet." #~ msgstr "Nu a fost încă implementat." - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Rezolvare conflicte" - -#~ msgid "There were conflicts during import." -#~ msgstr "Au existat conflicte în timpul importului." - -#~ msgid "Object" -#~ msgstr "Obiect" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} obiect are conflicte:" -#~ msgstr[1] "{0} obiecte au conflicte:" -#~ msgstr[2] "{0} de obiecte au conflicte:" - -#~ msgid "my version:" -#~ msgstr "versiunea mea:" - -#~ msgid "their version:" -#~ msgstr "versiunea lor:" - -#~ msgid "resolved version:" -#~ msgstr "rezolvat în versiunea:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nume autentificare (email) pentru contul OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Nume utilizator OSM (email)" - -#~ msgid "Unknown host" -#~ msgstr "Gazdă necunoscută" - -#~ msgid "position" -#~ msgstr "poziţie" - -#~ msgid "different" -#~ msgstr "diferit" - -#~ msgid "true" -#~ msgstr "adevărat" - -#~ msgid "false" -#~ msgstr "fals" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Rezolvă {0} conflicte în {1} obiecte" - -#~ msgid "Change" -#~ msgstr "Schimbă" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista" - -#~ msgid "Revert" -#~ msgstr "Anulează" - -#~ msgid "Date" -#~ msgstr "Dată" #~ msgid "" @@ -22605,4 +23416,58 @@ #~ "în lista de istoric." +#~ msgid "Data Layer" +#~ msgstr "Strat de date" + +#~ msgid "There were conflicts during import." +#~ msgstr "Au existat conflicte în timpul importului." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contactez serverul OSM..." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nume autentificare (email) pentru contul OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Nume utilizator OSM (email)" + +#~ msgid "my version:" +#~ msgstr "versiunea mea:" + +#~ msgid "their version:" +#~ msgstr "versiunea lor:" + +#~ msgid "resolved version:" +#~ msgstr "rezolvat în versiunea:" + +#~ msgid "true" +#~ msgstr "adevărat" + +#~ msgid "false" +#~ msgstr "fals" + +#~ msgid "position" +#~ msgstr "poziţie" + +#~ msgid "different" +#~ msgstr "diferit" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Rezolvă {0} conflicte în {1} obiecte" + +#~ msgid "Change" +#~ msgstr "Schimbă" + +#~ msgid "unnamed" +#~ msgstr "fără nume" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} obiect are conflicte:" +#~ msgstr[1] "{0} obiecte au conflicte:" +#~ msgstr[2] "{0} de obiecte au conflicte:" + #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Unele din noduri sunt (aproape) în linie" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 16826) +++ /applications/editors/josm/i18n/po/ru.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 23:40+0000\n" -"Last-Translator: pxx \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-27 17:55+0000\n" +"Last-Translator: kruvalig \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,83 +17,163 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Создание интерфейса" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "Невозможно применить проекцию {0} . Используется Меркатор" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +msgstr "Невозможно активировать защиту {0}. Используется Меркатор" + +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Ошибка" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Несохранённые изменения" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Сохранить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Отменить и выйти" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -102,32 +182,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Отмена" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнорируется неверная ссылка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Предупреждение" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорируется неверный адрес файла: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Отобразить информацию о программе." @@ -135,10 +275,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -146,5 +286,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -153,19 +293,19 @@ msgstr "Версия {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Последние изменения: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Версия Java: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Домашняя страница" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Отчёты об ошибках" @@ -175,37 +315,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Сведения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Для прочтения" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Лицензия" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Модули" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "О программе" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Файл не найден" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -217,5 +361,5 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,12 +367,5 @@ "связь." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Предупреждение" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -239,7 +376,35 @@ "примитивов" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Пожалуйста, выберите ряд для удаления." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Выберите один из вариантов:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Объединить точки" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Добавить точку..." @@ -251,14 +416,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -266,57 +433,57 @@ msgstr "Править: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Введите координаты новой точки" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Использовать десятичные градусы" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицательные значения обозначают западное/южное полушарие" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Широта" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Долгота" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Выстроить точки окружностью" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Переместить выделенные точки так, чтобы они сформировали окружность." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -332,26 +499,59 @@ msgstr "Инструмент: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Выделите не менее четырёх точек." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "Информация" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Выстроить точки линией" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "" "Переместить выделенные точки на прямую, проходящую через две крайние точки." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Выделите не менее трёх точек." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -362,18 +562,10 @@ "- {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Нарушение возможностей API" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Сбой инициализации API" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -384,5 +576,5 @@ "примитиве {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -393,46 +585,46 @@ "допустимую длину {2}. Значение длины {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Нарушение предусловия" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "данные" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "выделение" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "скачанное" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Показать {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Изменить масштаб чтобы показать {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -442,30 +634,30 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Ничего не выделено для показа." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Нет конфликтов чтобы их показать." +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "Объединить линию" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "Объединить несколько линий в одну." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Объединить линии, входящие в разные отношения?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -475,13 +667,13 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Объединить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Изменить направления?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -490,10 +682,10 @@ "Линии с их текущими направлениями не объединить. Обратить некоторые линии?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Перевернуть и объеденить" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -501,20 +693,20 @@ msgstr "Введите значения для всех конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Решение конфликтов" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Все линии были пустыми" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -533,23 +725,24 @@ msgstr "Копировать выделенные объекты в буфер обмена." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Выделите что-нибудь для копирования." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Создать окружность" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Создать окружность по трём выделенным точкам" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Точки не расположены по кругу" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -557,87 +750,122 @@ msgstr "Выберите 2 или 3 узла или линию с двумя или тремя узлами." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Удалить" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Удалить выделенные объекты." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Перезаписать" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "Файл уже существует. Перезаписать?" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Распределить точки" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "Расположить точки на равных расстояниях вдоль линии." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Скачать с OSM..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Скачать картографические данные с сервера OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Файл: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Скачать" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Выберите хотя бы один тип данных для загрузки." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "За время импорта произошло {0} конфликт(ов)" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Ошибка в течение загрузки" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Загрузка родителей примитива {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Дублировать" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Создать копию выделения копированием и вставкой." @@ -657,5 +885,5 @@ msgstr "Выйти из программы" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -665,58 +893,73 @@ "лицензированных под GPL" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Экспорт в GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Экспортировать данные в GPX файл" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Нет данных для экспорта. Создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "параметр ''{0}'' не должен быть нулевым" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "описание трека GPS" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Добавить информацию об авторе" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Настоящее имя" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Авторские права (ссылка)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Набор" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Авторские права (год)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Ключевые слова" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Опции экспорта" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Экспортировать и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -727,25 +970,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Ошибка" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Выберите лицензию из набора" @@ -755,41 +978,44 @@ msgstr "Online-справка по JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Открыть в браузере" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Правка" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Возможно только редактирование справочных страниц JOSM Online Help" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Ошибка при загрузке страницы {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." @@ -797,5 +1023,5 @@ "Страница справки отсутствует. Создайте её на английском." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -818,5 +1044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "Информация об Элементе" +msgstr "Информация об элементе" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -833,30 +1059,40 @@ msgstr "Включить точку в состав ближайшей линии." -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Включить точку в линию" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Нет ярлыка" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Объединить выделенный слой с нижележащим." + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "Объединить точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "Объединить точки в одну (более старую)" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "Пожалуйста, выберите как минимум две точки для объединения." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Объединить точки из разных отношений?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -866,9 +1102,9 @@ "объединить?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" -msgstr "Очистить в любом случае" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +msgstr "Объединить в любом случае" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -876,60 +1112,71 @@ "используется." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Объединить {0} точек" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "выделение" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Обновить выбранные примитивы с сервера" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Зеркало" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Зеркало выбранных узлов и путей." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Пожалуйста, выберите хотябы один узел или путь." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "вверх" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Переместить объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "вниз" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "влево" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "вправо" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Переместить {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Перемещает объекты {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Невозможно переместить объекты за пределы мира." @@ -937,5 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Создать" @@ -945,26 +1192,17 @@ msgstr "Создать новую карту." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "безымянный" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Открыть..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Открыть файл." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Невозможно прочитать \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -993,10 +1231,10 @@ msgstr "Загрузить URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Сделать углы прямыми" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "" @@ -1004,13 +1242,13 @@ "градусов" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Возможно выбрать только две точки" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Возможно выбирать только линии." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" @@ -1018,5 +1256,5 @@ "точек." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" @@ -1024,9 +1262,10 @@ "функции." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Используется проекция EPSG:4326, что может привести
к нежелательным " @@ -1034,9 +1273,9 @@ "предупреждение больше не появлялось.
Всё равно продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Выбрана только одна точка" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Сделать углы прямыми" @@ -1052,11 +1291,11 @@ msgstr "Вставить содержимое буфера." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Вставить тэги" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Применить тэги из буфера ко всем выделенным объектам." @@ -1084,16 +1323,21 @@ msgstr "Вернуть последнее отменённое действие." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Переименовать слой" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Переименовать файл" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Невозможно переименовать файл \"{0}\"." @@ -1107,9 +1351,9 @@ msgstr "Изменить направление линии на противоположное." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Пожалуйста, выберите как минимум одну линию." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Изменить направление линии" @@ -1117,17 +1361,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Сохранить" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Сохранить текущие данные." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Файл {0} существует. Перезаписать?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1137,25 +1383,25 @@ "создайте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Нет открытых документов. Нечего сохранять." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Пустой документ" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "В документе не содержиться данных" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Сохранить в любом случае" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Конфликты" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1165,54 +1411,77 @@ "будут обработаны, как будто вы отменили их все. Продолжить?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Отказаться от конфликтов и сохранить" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Сохранить файл OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Сохранить файл GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Сохранить слой" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Невозможно создать резервную копию." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Неизвестное расширение файла: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Произошла ошибка во время соединения с сервером
Подробности: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "При восстановлении из резервной копии возникла ошибка." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Неизвестное расширение файла." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "При сохранении возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "При восстановлении из резервной копии возникла ошибка." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Сохранить как..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Сохранить текущие данные в новый файл." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Выбрать всё" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1247,16 +1516,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Закрыть" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Разделить линию" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Разделить линию в выбранной точке." @@ -1266,5 +1535,5 @@ msgstr "Текущее выделение невозможно разделить." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1273,5 +1542,5 @@ msgstr[2] "Выбранные точки не являются частью пути." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1292,9 +1561,9 @@ "выберите путь ещё." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Выбранные точки не являются частью одной линии." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1303,10 +1572,10 @@ msgstr[2] "Выбранная линия не содержит выбранных точек" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Чтобы разделить замкнутую линию, выберите две или более точки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1316,21 +1585,23 @@ "линии)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Участие в отношениях было применено ко всем новым линиям.\n" "Проверьте, и при необходимости внесите корректировки." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Отношения членства были скопированы на все новые линии. \n" "Вы должны проверить и исправить, если это необходимо." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1351,52 +1622,52 @@ msgstr "Включает/выключает глобальную установку: «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "UnGlue Ways" msgstr "Разъединить линии" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "Дублировать точки, используемые несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "Данная точка не связана с чем-либо еще." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "Ни одна из этих точек не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "Ни одна из этих линий не притянута к другим." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "Выделенные объекты невозможно разъединить" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Выберите один из вариантов:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Одна точка с тэгами, или" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Одна точка, используемая несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Одна точка, используемая несколькими линиями и одной из этих линий, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1405,5 +1676,5 @@ "несколькими линиями." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1416,9 +1687,9 @@ "дубликаты точек, и все точки будут выбраны" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Неприкрепленная точка" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1426,5 +1697,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1440,140 +1711,91 @@ msgstr "Отменить последнее действие." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Снять выделение" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Снять выделение со всех объектов." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Снять выделение со всего (Фокус)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Снять выделение со всего (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Обновить данные" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Обновить слой данных с сервера (скачать данные заново)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Нет данных" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Ошибка обновления выбранного примитива." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Ошибка обновления" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Не найдено слоя данных GPX" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Не могу найти примитив с ID {0} в текущем источнике данных" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Прошущен примитив" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Обновить выборку" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Обновить выбранные примитивы с сервера" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Не выбраны примитивы для обновления." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Выборка пуста" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Загрузить на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Загрузить все изменения на OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Новые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Изменённые объекты:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Удаляемые объекты:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Опишите изменения для закачиваемых данных:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "Загрузить эти изменения?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Загрузить изменения" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Нечего загружать. Сначала создайте данные." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Нет изменений для загрузки." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Выгрузка" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Обновление примитива" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Синхронизированы только {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Синхронизировать весь набор данных" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1595,17 +1817,17 @@ "редактирование.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Обнаружен конфликт" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "неожиданное возвращённое значение. Получено {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1621,5 +1843,5 @@ "редактирования.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1628,57 +1850,60 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Ошибка выгрузки данных на сервер, так как ваши " -"данные
противоречат обязательным условиям.
Сообщение об ошибке:
" -"{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Нарушение предварительного условия" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

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

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

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

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

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

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

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Конфликт в данных" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Сохранить текущие данные." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Применить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "Применить обновления и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "Отменить обновления и закрыть диалог" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Добавить пустой тег" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Удалить выделенные теги" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Скачать участников" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "Редактор зависимостей: скачать членов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "Задать роль для выбранных членов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "Применить роль" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Да, очистить" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Подтверждение действия дистанционного управления" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "Создать копию этих отношений и открыть их в другом окне" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Уменьшить масштаб" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Переместить выбранных членов отношения вниз" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Ссылается на" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "Изменить выбранное отношение" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Применить изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Основной" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Объект" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "присоединенный" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Переместить вверх" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Переместить выбранных членов отношения вверх" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Добавить выбранное" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Сделать все выбранные объекты участниками отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Удалить выбранные" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Удалить все выделенные объекты из связей" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Переместить вниз" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Переместить выбранных членов отношения вниз" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Удалить текущего участника из отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Скачать участников" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Редактор отношений: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +msgstr "Изменить новое отношение в слое ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +msgstr "Изменить новое отношение в слое ''{0}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "Изменить отношение #{0} в слое ''{1}''" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Загрузить выделенное" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4573,5 +5361,5 @@ msgstr "<множественный>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4582,26 +5370,22 @@ msgstr[2] "Удалить старые ключи из {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Обновление свойств {0} объекта" -msgstr[1] "Обновление свойств {0} объектов" -msgstr[2] "Обновление свойств {0} объектов" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Закладки" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Пожалуйста, введите сначала желаемые координаты" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Пожалуйста, введите название места." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Изменить расположение" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Сначала выберите закладку." @@ -4636,17 +5420,17 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Источники и типы данных" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Скачать как новый слой" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Область для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" @@ -4654,18 +5438,18 @@ "запрос." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Область для скачивания приемлема по площади." #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Нулевой исключение, возможно есть отсутствующие тэги" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Задайте строку для поиска" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Не удается получить результаты поиска" @@ -4673,5 +5457,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Название места для поиска:" @@ -4679,5 +5463,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4685,6 +5469,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "название" @@ -4723,6 +5507,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4745,15 +5529,15 @@ msgstr "тип" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "возле" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "масштаб" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4762,5 +5546,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Интерактивная карта" @@ -4792,5 +5576,11 @@ msgstr "История для {0}{1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Закрыть диалог" @@ -5532,5 +6322,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5687,9 +6477,11 @@ "{2}" msgstr "" +"Версия {0} дата создания: {1} автор: " +"{2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 #, java-format msgid "Version {0} created on {1} by {2}" -msgstr "" +msgstr "Версия {0} дата создания: {1} автор: {2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19 @@ -5697,59 +6489,59 @@ msgstr "Версия" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Изображения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Прочесть GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Нет указания времени для точки {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невозможно прочесть время \"{0}\" у точки {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Не найдено изображений с информацией о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Чтение {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Изображения с данными о местоположении" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Начало GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Конец GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "текущая разница: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "разница в часовых поясах: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5758,138 +6550,128 @@ msgstr[2] "изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} в пределах трека" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Синхронизация часов" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невозможно прочесть дату из файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF файла \"{0}\" не содержит информации о времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Часовой пояс GPS объекта (отличается от фотографии)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизировать время с GPS приёмником" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Введённое время невозможно использовать" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "точка GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Настроить отрисовку линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Использовать глобальные настройки." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Не отображать линии между точками для этого слоя." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Выбрать варианты отрисовки линий" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Выбрать цвет" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "По умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Выбор цвета" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Маркеры из именованых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Назвать маршрутные точки из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Импортировать аудиофайлы" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Аудиофайлы Wave (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Аудиомаркеры из {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Импорт изображений" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5899,5 +6681,5 @@ msgstr[2] "{0} дорожек, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5907,5 +6689,5 @@ msgstr[2] "{0} маршрутов, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5915,30 +6697,30 @@ msgstr[2] "{0} путевых точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Название: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Описание: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Временной интервал: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Длина: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Преобразовать в слой данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5948,43 +6730,43 @@ "
Если хотите загрузить трэк, сделайте это по ссылке:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Преобразовано из: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Скачать с JSM данные вдоль трэка" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Скачать всё в пределах:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} метров" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} кв. км." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5995,9 +6777,9 @@ "Продолжить?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "На слое отсутствует трек GPX, чтобы наложить звук." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6007,5 +6789,5 @@ "будут пропущены или перенесены в начало трека." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6015,47 +6797,48 @@ "их время, были проигнорированы." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +"Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} удалено)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6081,5 +6864,5 @@ msgstr[2] "треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6088,5 +6871,5 @@ msgstr[2] "точек" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6096,5 +6879,5 @@ msgstr[2] "трек с {0} точками" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6104,5 +6887,5 @@ msgstr[2] "{0} состоит из {1} треков" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6123,5 +6906,5 @@ msgstr[2] "маркеров" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6131,9 +6914,9 @@ msgstr[2] "{0} состоит из {1} маркеров" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Синхронизировать аудио" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6141,20 +6924,20 @@ "Вам необходимо приостановить звуковой файл в момент воспроизведения реплик." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Аудио синхронизировано на точке {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Невозможно синхронизировать слой который используется" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Установить маркер аудио на позиции проигрывания" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6164,10 +6947,17 @@ "маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Нет существующих аудио маркеров на этом слое" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Показать/скрыть текст/значки" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Показать/скрыть текст и значки маркеров." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6177,5 +6967,5 @@ "которым связана звуковая дорожка (после первого маркера)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6185,29 +6975,29 @@ "или на точку трека, где вы хотите синхронизировать." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Невозможно создать новый аудио-маркер." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Произошла ошибка при попытке показать URL для этого маркера" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(по ссылке: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Невозможно отобразить URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Дополнительные параметры" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Установка параметров напрямую. Пользоваться с осторожностью!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6215,26 +7005,26 @@ msgstr "Поиск: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Текущее значение - по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Текущее значение - ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Пожалуйста, выберите ряд для редактирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6242,14 +7032,14 @@ msgstr "Новое значение для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Пожалуйста, выберите ряд для удаления." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Введите новый ключ и значение" @@ -6389,40 +7179,40 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Цвет" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Стиль точки {0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Слой: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Выбрать" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Выберите цвет для {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Задать в значение по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Задать все значения по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Цвета, используемые разными объектами в JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Цвета" @@ -6765,48 +7555,57 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +msgstr "Использованный стиль" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Настроить доступные модули." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Скачать список" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Обновить" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Настроить сайты..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +msgstr "Добавить ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Пожалуйста, выберите запись." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +msgstr "Редактировать ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Добавить ссылку на описание JOSM плагина" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Настроить сайты с модулями" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Настройки экрана" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6814,29 +7613,29 @@ msgstr "Различные настройки, влияющие на внешний вид программы." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Параметры соединения" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Параметры соединения с сервером OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Настройки карты" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Параметры проекции карты и отображения данных" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Параметры Аудио" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Параметры звукового проигрывателя, и звуковых маркеров." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу." @@ -6888,5 +7687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42 msgid "Login name (e-mail) to the OSM account." -msgstr "" +msgstr "Логин (e-mail) учётной записи OSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43 @@ -6901,5 +7700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47 msgid "OSM username (e-mail)" -msgstr "" +msgstr "Имя пользователя на OSM (e-mail)" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49 @@ -6940,59 +7739,61 @@ msgstr "Горячая клвиша" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +msgstr "Краткое описание: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +msgstr "URL: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +msgstr "Автор: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +msgstr "Веб-страница: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +msgstr "Версия: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +msgstr "Пути к иконкам" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +msgstr "Копировать умолчания" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Пожалуйста, выберите ряд для копирования." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +msgstr "Добавить новый XML источник к списку." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Удалить источник из списка." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7180,33 +7981,33 @@ msgstr "Группы модификаторов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Подробнее" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Использовать шаблон ''{0}'' из группы ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Использовать шаблон ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "замкнутая" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7217,15 +8018,15 @@ msgstr "Не удалось прочитать помеченные настройки исходника: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7236,18 +8037,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ничего не выбрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Элементы выбраны неверно!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Применить шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Изменить параметры" @@ -7258,33 +8059,36 @@ msgstr "Группа настроек ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Подключение к серверу OSM..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Загрузка точек с {0} до {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Скачивание данных OSM..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Ошибка! Возможно отсутствуют тэги." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Подготовка данных..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Невозможно прочитать \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7292,24 +8096,24 @@ msgstr "GPS файлы" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Маркеры из {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Файл \"{0}\" не существует" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" -msgstr "" +msgstr "Парсинг файла \"{0}\" потерпел неудачу" #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 @@ -7322,59 +8126,79 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Скачивание данных OSM..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +msgstr "Сервер выдал ошибку 404 для id {0}. Пропускаем" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " "for each primitive" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +"Сервер выдал ошибку 404, повторная попытка индивидуальными запросам для " +"каждого примитива" + +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 файлы" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Координаты импортированы: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Неправильно составленные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Ошибки контрольных сумм: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Неизвестные предложения: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Пустые координаты: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Импорт NMEA успешно завершён" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Сбой при импорте NMEA!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7385,59 +8209,74 @@ "поддержке {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +"неожиданный формат новой версии изменённого примитива \"{0}\", текущее " +"значение \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Открывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Закрывается список правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Нет изменений для выгрузки" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Подготовка..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Закачка..." +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Скнирование каталога {0}" + #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91 #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Код={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Сервер возвратил ошибку с кодом {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 msgid "OSM Server Files bzip2 compressed" -msgstr "" +msgstr "Файлы сервера OSM сжаты с помощью bzip2" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31 msgid "Invalid bz2 file." -msgstr "" +msgstr "bz2 файл содержит ошибки" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73 @@ -7461,12 +8300,7 @@ msgstr "Идентификатор пользователя" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Прерывание..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" -msgstr "" +msgstr "Файлы сервера OSM сжаты с помощью gzip" #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68 @@ -7525,115 +8359,141 @@ "текущее значение ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Ошибка при разборе." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM файлы сервера" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Неизвестная версия" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Номер версии отсутствует по данным OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Версия неизвестна: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Найден элемент вне пути." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "у нет ссылок ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Найден тэг вне отношения." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +msgstr "Отсутствует атрибут \"ref\" участника отношения {0}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение " +"{1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgstr "Отсутствует атрибут \"type\" участника {0} в отношении {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Неполная спецификация с ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Недопустимый объект с id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +"Неверное значение атрибута \"version\" OSM примитива с id {0}, текущее " +"значение {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Отсутствует необходимый атрибут \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"Пропуск линии потому, что она включает в себя узлы, которые не существуют: " -"{0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Подготовка данных..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Неверный номер точки" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "требуется параметр id ''{0}'' > 0. Получен {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "требуется параметр ''{0}'' > 0. Получен {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "Загрузка истории..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Соединение с сервером..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Не удалось установить соединение с API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7642,5 +8502,18 @@ "соединение." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7649,16 +8522,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Обновить модули" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Скачать модули" @@ -7675,5 +8543,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7683,23 +8551,23 @@ msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Загрузка Плагина {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Пропустить загрузку" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM версии {0} требует плагин {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Загрузить Плагин" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Пропустить Загрузку" @@ -7710,34 +8578,32 @@ msgstr "В модуле {0} произошла ошибка" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Внимание - произошёл запрос на загрузку модуля {0}. Этот модуль больше не " "требуется." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Плагин {0} требует обновление JOSM до версии {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Модуль {0} требуется модулю {1}, но не найден." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Модуль не найден : {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Последнее обновление модулей более {0} дней назад" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7747,21 +8613,21 @@ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Отключить модуль" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Сохранение плагина" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7771,5 +8637,5 @@ "разрешение переписывать существующие модули." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7777,10 +8643,10 @@ msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Согласно информации в модуле, автором является {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7789,9 +8655,9 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Отключить модуль?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7801,26 +8667,23 @@ "модуль." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Информация" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Информации о модулях не найдено." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "описание отсутствует" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7830,13 +8693,18 @@ msgstr[2] "Скачать информацию о модуле с {0} сайтов" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Информации о модулях не найдено." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "Плагин {0} не доступен. Обновление пропущено." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Все установленные модули имеют последнюю версию." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7849,9 +8717,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Скачивание недостающих модулей" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7864,57 +8732,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "неизвестный" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Версия {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Модуль из поставки JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Ошибка чтения файла с описанием модуля: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Это позже конца записи" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Ошибка при воспроизведении звука" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ничего не делать" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Сообщить об ошибке" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7928,14 +8774,14 @@ "последней версией JOSM, будьте добры, отправьте отчёт об ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Неожиданная ошибка" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7943,5 +8789,5 @@ "подробнее!)" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7951,17 +8797,33 @@ "ошибке." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Прикрепите следующую информацию к отчёту:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Текст уже скопирован в буфер обмена)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Больше не показывать" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "Не могу найти перевод {0}. Возвращено {1}." + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7974,5 +8836,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7982,5 +8844,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7991,13 +8853,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Создать сетки линий" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8007,21 +8884,21 @@ "имеют различные узлы и один общий" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Выберите две линии, с общим узлом" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Выберите два пути с единственным общим узлом" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Создание сетки линий" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Загрузка трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8029,74 +8906,75 @@ msgstr "Загрузка трэков" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Публичный" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Описание" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Пожалуйста введите описание вашего трэка" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Введите теги описывающие ваш трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Выбранный трэк: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Подключение..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Загрузка отменена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Ошибка во время загрузки" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Загрузка GPX успешно закончена" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Загрузка GPX трэка: {0}% ({1} из {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Нет описания. Просьба представить некоторое описание." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Слой GPX не выбран. Не удается загрузить трэк." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Нет имени пользователя" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Нет пароля" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Загрузка GPX трэка" @@ -8166,33 +9044,34 @@ msgstr "Один из выбранных файлов пуст!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Загрузка фото..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Не удалось получить канонический путь к каталогу {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Скнирование каталога {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Найден пустой файл в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Ошибка чтения файлов в каталоге {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Коррелируют с GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8212,15 +9091,15 @@ msgstr "Файлы GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Файл {0} загружен под именем \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Ошибка разбора {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8232,34 +9111,34 @@ "прочитаете на фото и выберите часовой пояс
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Время фотоснимка (из EXIF):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Время GPS (прочтите на фото вверху): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [дд/мм/гггг чч:мм:сс]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Я нахожусь в часовом поясе: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Без даты" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Открыть другое фото" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Синхронизация времени с фотографией GPS-приемника" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8269,70 +9148,70 @@ "Пожалуйста, используйте запрашиваемый формат" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Недопустимая дата" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "<Не загружены треки GPX>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "Трек GPX: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Открыть другой трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Часовой пояс: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Смещение:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "Я могу сфотографировать экран GPS приёмника.
Это поможет?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Обновление позиции для: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Все изображения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Изображения без координат в заголовках Exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Картинки без ярлыков" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Сопоставить изображения с GPX треком" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Совпадения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Авто-Угадывание" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Необходимо выбрать трек GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Не выбрано трека GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8343,9 +9222,9 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Недопустимый часовой пояс" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8356,26 +9235,26 @@ "Ожидаемый формат: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Недопустимое смещение" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Надено {0} совпадений из {1} в GPX трэке {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Трек GPX загружен" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "ыбранные фотографии не содержат информацию о времени." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Фотографии не содержать информацию о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8383,53 +9262,55 @@ "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX трек не содержит информации о времени" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Часовой пояс: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Минуты: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Секунды: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Совпавшие {0} из {1} фотографий с GPX треком." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Разница во времени {0} дней)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Смещение между треком и фотографией: {0}м {1}с" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " "adjust the sliders to manually match the photos." msgstr "" - -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +"Произошла ошибка во время попытки сопоставить фотографии с GPX треком. Вы " +"можете вручную сопоставить фотографии использую ползунки." + +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Сопоставление фотографий треку прервано" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Настройка часового пояса и смещения" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Значения по умолчанию" @@ -8451,5 +9332,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Ошибка при загрузке файла" @@ -8472,6 +9353,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Не правильная ссылка" @@ -8650,22 +9531,22 @@ msgstr "Добавить \"source=...\" к элементам?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Загружается {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Соединение с WMS Server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Создание зданий" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8675,18 +9556,18 @@ "размер импортируемого здания ограничено, максимум 1 км2 ." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Пожалуйста, включите Авто-источники и проверте millesime кадастр." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Экспортировать окно просмотра SVG" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Выделить лучшее расположение границы" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Создать границы" @@ -8788,5 +9669,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35 msgid "Adjust the position of the WMS layer (raster images only)" -msgstr "" +msgstr "Подогнать позицию WMS слоя (только растровые изображения)" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19 @@ -8805,6 +9686,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Пустой слой" @@ -8833,5 +9714,5 @@ msgstr "общий квадрат: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8842,14 +9723,14 @@ "Создайте новый файл." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Ошибка формата кеша" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Ошибка кеширования зоны Ламберта" @@ -8891,5 +9772,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 msgid "Split area" -msgstr "" +msgstr "Разделить область" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 @@ -8922,5 +9803,5 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65 msgid "TCX Files (*.tcx)" -msgstr "" +msgstr "Файлы TCX (*.tcx)" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -8937,4 +9818,9 @@ msgstr "Создать копию линии" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Никаких данных не загружено" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8945,9 +9831,9 @@ msgstr "Создать копию линии" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Слой для редактирования GPX трэков" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Преобразовать в GPX слой с обезличенным временем" @@ -9068,30 +9954,30 @@ msgstr "удалить данные после импорта" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Импортирование данных с устройства." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Импортирование данных с DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Ошибка удаления данных." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "Импортированы данные с {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "На устройстве не найдено данных." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Ошибка подключения." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9103,14 +9989,14 @@ "mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Импорт с Globalsat" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Импортировать" @@ -9201,40 +10087,40 @@ msgstr "Открыть изображения в ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Индекс направления '{0}' не найден" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Начальное положение за границами рамки." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Поиск береговой линии..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "найдено {0} точек..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Трассировщик озёр" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Трассировщик озёр" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Ошибка создания директории кэша: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Трассировка" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "проверка кэша..." @@ -9243,26 +10129,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Упрощение геометрии..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Аппроксимация Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Удаление повторяющихся точек..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Трассировщик озёр" @@ -9347,7 +10225,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "вода" @@ -9505,9 +10383,9 @@ msgstr "Настройки модуля Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Скачивается квадрат изображения..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Невозможно получить изображение" @@ -9758,18 +10636,18 @@ msgstr "Неизвестный статус проблемы" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Открыть видимое..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Открыть только файлы, видимые в текущей области на экране" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Не открыта область - невозможно определить границы!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9796,33 +10674,33 @@ msgstr "исполняемый файл Firefox" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "загрузить данные из API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "изменить выделение" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "изменить область просмотра на экране" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "подтверждать все действия удалённого управления вручную." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Модуль, позволяющий другим приложениям управлять JOSM" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Дистанционное управление" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Настройки модуля дистанционного управления" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9834,29 +10712,29 @@ "приложений, подключающихся к модулю." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Разрешённые действия" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" "модуль дистанционного управления получил запрос на загрузку данных из API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Подробности запроса: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Разрешить действие?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Подтверждение действия дистанционного управления" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9867,9 +10745,9 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Редактировать отношение" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Редактировать отношения" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 @@ -9987,5 +10865,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "изображение " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10124,4 +11002,27 @@ msgstr "Выделение" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Обновление свойств {0} объекта" +msgstr[1] "Обновление свойств {0} объектов" +msgstr[2] "Обновление свойств {0} объектов" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" +"Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не найдены." + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10146,5 +11047,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "" +msgstr "неожиданный номер колонки {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -10380,29 +11281,29 @@ "Открывает диалоговое окно, которое позволяет перейти к определенной местности" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Введите Lat / Lon, чтобы перейти к позиции." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Вы также можете вставить URL из www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Приближение (в метрах)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Перейти туда" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Перейти к позиции" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" @@ -10410,5 +11311,5 @@ "проверьте." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Невозможно разобрать широту/долготу" @@ -10446,6 +11347,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Ошибки при проверке" @@ -10455,10 +11356,10 @@ msgstr "Проверка не выявила ошибок" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Сетка" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10549,23 +11450,15 @@ msgstr "Произвести проверку данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Данные содержат ошибки. Всё равно продолжить?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Открыть окно проверки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Показать проблему" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Проверить" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Проверить выделенное, либо все загруженные данные" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10638,22 +11531,22 @@ msgstr "Пересекающиеся линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Дублированные узлы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Этот тест проверяет, чтобы не было совпадения узлов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Повторяющиеся точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Ищет линии с различными точками, имеющими одинаковые координаты" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Дублирующиеся узлы на линии" @@ -10730,24 +11623,24 @@ "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Проверка параметров:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Неправильно просталенныех тегов линиий - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ошибка проверки правописания строки: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10758,7 +11651,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Неправильная комбинация тегов/значений тегов" @@ -10766,78 +11659,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Проблемы отображения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Неправильный ключ {0}." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Пустые значения тегов" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Неверный ключ свойств" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Неправильный пробел в названии ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Значение начинается или заканчивается пробелом" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Значения содержат HTML разметку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Ключа ''{0}'' нет в настройках." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Установки не содержат собственно ключа" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Не содержит зарание устанвленного значения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Проверьте ключи свойств." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Проверьте, что ключ действителен проверен в отношении списка слов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Использовать сложную проверку" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Проверка собственных значений и использование сложных правил тегов." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Исходники TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10847,21 +11742,21 @@ "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Добавить в список новый источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Править выбранный источник." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Источники данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Проверьте правильно значений" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" @@ -10869,41 +11764,41 @@ "установок проверки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Проверить для FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Ищет узлы или линии с FIXME в свойствах какого-либо значения." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Проверить заметки." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Проверить содержит ли нарисованная карта ошибки данных" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Использовать файл данных по умолчанию." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Используется файл данных установленный по умолчанию" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Использовать установленный по умолчанию файл проверки правописания" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "" @@ -10911,22 +11806,22 @@ "(рекомендуется)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Исправить параметры" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Не удалось найти тип элемента" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Не удалось найти уровень предупреждения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Недопустимое выражение ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11071,7 +11966,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "здание" @@ -11085,5 +11980,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "область" @@ -11118,10 +12013,10 @@ msgstr "Конечный узел связной линии возле другой линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Непомеченные и не соединённые узлы" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." @@ -11175,8 +12070,34 @@ msgstr "Неверное направление линии суши: земля не слева" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "Сканированная карта..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" +"Показать карту, которая ранее была отсканирована и загружена на walking-" +"papers.org" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "Введите URL или ID (часть после ?id= в URL) на walking-papers.org" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11187,10 +12108,10 @@ msgstr "Выделите начальный узел в конце пути" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Достигнут конец линии" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Достигнут перекрёсток" @@ -11261,14 +12182,14 @@ msgstr "Справка по модулю WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Трансформированное изображение..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Загрузить привязанные изображения с различных сервисов" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11279,26 +12200,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Индивидуальная ссылка WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Домашняя страница" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS URL или ID Изображения:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Добавить привязанное изображение" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11308,5 +12229,5 @@ "Пожалуйста попробуйте ещё раз." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Нет верных WMS URL или ID" @@ -11316,5 +12237,5 @@ msgstr "Отрегулируйте положение выбранного слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11325,19 +12246,19 @@ "Это может привести к неправильным координатам." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Автоматическое скачивание" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "Скачивание слоя WMS ({0}), в масштабе {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11346,37 +12267,37 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Скачать видимые квадраты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Перезагрузить ошибочные фрагменты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "Сохраниеть WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -11384,51 +12305,51 @@ "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Открыть пустой WMS-слой для загрузки данных из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Настройки модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Название меню" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Ссылка на WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Имя пункта меню (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (по умолчанию)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Введите имя пункта меню и URL этого WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Копия поумолчанию" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Загрузчик" @@ -11514,4 +12435,5 @@ "Creating and handling address nodes and buildings within Czech Republic." msgstr "" +"Создание и управление адресованными узлами и зданиями в Чешской Республике" #. Plugin dataimport @@ -11551,11 +12473,16 @@ "JOSM." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Предоставлен фоновый слой который отображает сетку на карте" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11568,10 +12495,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11580,5 +12507,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11591,5 +12518,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11602,15 +12529,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Отобразить фоновый рисунок OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11620,5 +12547,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11626,5 +12553,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11635,15 +12562,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Разрешить другим приложениям посылать команды JOSM." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11654,10 +12581,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11668,15 +12595,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Разрешить добавить теги/узлы на текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11690,10 +12617,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11705,5 +12632,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11714,5 +12641,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11723,11 +12650,18 @@ "правописание для комплексных имён тегов." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "Быстрая загрузка вдоль большого набор пересекающихся линий" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12884,58 +13818,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12949,6 +13831,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "Автобан" @@ -12974,6 +13856,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "Автострада" @@ -12999,6 +13881,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "Основная" @@ -13024,6 +13906,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "Вторичная" @@ -13037,5 +13919,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "Третичная" @@ -13053,5 +13935,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "местного значения" @@ -13085,6 +13967,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "Служебная" @@ -13111,6 +13993,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "Строительство" @@ -13160,5 +14042,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "Круг" @@ -14137,5 +15019,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "Болото" @@ -15866,27 +16748,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "спорт" @@ -16334,5 +17216,5 @@ #: build/trans_presets.java:1925 msgid "Swimming" -msgstr "Плаванье" +msgstr "Плавание" #. item @@ -18725,7 +19607,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "велосипедный" @@ -18795,7 +19677,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "пеший" @@ -18821,5 +19703,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "метро" @@ -19310,13 +20192,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "уменьшать" @@ -19358,5 +20240,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "лошадь" @@ -19576,4 +20458,66 @@ msgstr "ограждение" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Автомагистраль" + #. color tertiary #. @@ -19608,6 +20552,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "улица" @@ -19663,7 +20607,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "шоссе" @@ -19719,8 +20663,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "железная дорога" @@ -19741,5 +20685,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "услуги" @@ -19753,5 +20697,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "брод" @@ -19772,5 +20716,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "кольцо" @@ -19785,5 +20729,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "пункт неотложной помощи" @@ -19798,5 +20742,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "берег реки" @@ -19810,5 +20754,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "поток" @@ -19822,5 +20766,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "док" @@ -19848,5 +20792,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "акведук" @@ -20014,13 +20958,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "искусственный" @@ -20082,7 +21026,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "железнодорожная станция" @@ -20105,10 +21049,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "другая жд дорога" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "жд дорога сверху" @@ -20144,7 +21088,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "Старая жд дорога" @@ -20189,6 +21133,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "воздушная трасса" @@ -20202,5 +21146,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "пассажирский терминал" @@ -20222,5 +21166,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "воздушная трасса темная" @@ -20234,5 +21178,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "воздушная трасса светлая" @@ -20280,7 +21224,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "воздушная трасса" @@ -20297,5 +21241,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "легкая трасси" @@ -20310,5 +21254,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "промежуточная трасса" @@ -20323,5 +21267,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "продвинутая трасса" @@ -20336,5 +21280,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "специалист лыжной трассы" @@ -20349,5 +21293,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "бесплатная трасса" @@ -20362,5 +21306,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "трасса для новичков" @@ -20465,10 +21409,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "энергия" @@ -20482,5 +21426,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "плотина" @@ -20494,5 +21438,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "трубопровод" @@ -20620,12 +21564,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "свободное время" @@ -20639,5 +21583,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "гавань" @@ -20709,8 +21653,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "использование" @@ -20812,10 +21756,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "режим использования" @@ -21201,22 +22145,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "легкое использование" @@ -21248,6 +22192,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "легкая вода" @@ -21308,8 +22252,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "здоровье" @@ -21662,26 +22606,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "Магазин" @@ -21753,8 +22697,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "отель" @@ -21904,9 +22848,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "туризм" @@ -21978,8 +22922,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "исторический" @@ -22050,8 +22994,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "зеленый" @@ -22065,5 +23009,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "карьер" @@ -22077,5 +23021,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "мусорная свалка" @@ -22097,5 +23041,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "водоём" @@ -22109,5 +23053,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "лес" @@ -22121,5 +23065,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "двор фермы" @@ -22142,5 +23086,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "розничная продажа" @@ -22154,5 +23098,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "промышленный" @@ -22166,5 +23110,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "заброшенная застройка" @@ -22178,5 +23122,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "участок для застройки" @@ -22190,5 +23134,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "жд разъезд" @@ -22245,7 +23189,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "военный" @@ -22259,5 +23203,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "кладбище" @@ -22270,5 +23214,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "пик" @@ -22283,5 +23227,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ледник" @@ -22295,5 +23239,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "вулкан" @@ -22348,8 +23292,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "природный" @@ -22363,5 +23307,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "кустарник" @@ -22375,5 +23319,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "здоровье" @@ -22387,5 +23331,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "лес" @@ -22399,5 +23343,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "грязь" @@ -22411,5 +23355,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "пляж" @@ -22487,8 +23431,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "маршрут" @@ -22536,7 +23480,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "граница" @@ -22678,10 +23622,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "место" @@ -22729,6 +23673,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "адрес" @@ -22989,20 +23933,20 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -23018,5 +23962,5 @@ #: build/trans_wms.java:22 msgid "Terraserver Topo" -msgstr "" +msgstr "Terraserver Topo" #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& @@ -23025,24 +23969,84 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Слой данных" - -#~ msgid "Uploading data" -#~ msgstr "Загрузка данных" - -#~ msgid "Not implemented yet." -#~ msgstr "Ещё не реализовано." +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее." + +#~ msgid "API initialization failed" +#~ msgstr "Сбой инициализации API" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?" + +#~ msgid "No data" +#~ msgstr "Нет данных" + +#~ msgid "Update failed" +#~ msgstr "Ошибка обновления" + +#~ msgid "Missing primitive" +#~ msgstr "Прошущен примитив" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Применить частичное решение" + +#~ msgid "Layers: {0}" +#~ msgstr "Слои: {0}" + +#~ msgid "Conflict created" +#~ msgstr "Конфликт создан" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Удалить текущего участника из отношения" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме." + +#~ msgid "Validate" +#~ msgstr "Проверить" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Проверить выделенное, либо все загруженные данные" #~ msgid "Email" #~ msgstr "Электронная почта" -#~ msgid "Resolve Conflicts" -#~ msgstr "Разрешить конфликты" - -#~ msgid "There were conflicts during import." -#~ msgstr "При импортировании возникли конфликтные ситуации." - -#~ msgid "Object" -#~ msgstr "Объект" +#~ msgid "Contacting the OSM server..." +#~ msgstr "Соединение с OSM сервером..." + +#~ msgid "Aborting..." +#~ msgstr "Прерывание..." + +#~ msgid "position" +#~ msgstr "положение" + +#~ msgid "different" +#~ msgstr "различный" + +#~ msgid "true" +#~ msgstr "истина" + +#~ msgid "false" +#~ msgstr "ложь" + +#~ msgid "Change" +#~ msgstr "Изменить" + +#~ msgid "unnamed" +#~ msgstr "безымянный" + +#~ msgid "Rotate" +#~ msgstr "Вращать" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Разрешить {0} конфликтов в {1} объектах" + +#~ msgid "my version:" +#~ msgstr "моя версия:" #~ msgid "{0} object has conflicts:" @@ -23052,48 +24056,67 @@ #~ msgstr[2] "{0} объектов имеет конфликты." -#~ msgid "my version:" -#~ msgstr "моя версия:" +#~ msgid "Resolve Conflicts" +#~ msgstr "Разрешить конфликты" #~ msgid "their version:" #~ msgstr "их версия:" +#~ msgid "Click Reload to refresh list" +#~ msgstr "Нажмите \"Обновить\" для обновления списка" + +#~ msgid "Date" +#~ msgstr "Дата" + +#~ msgid "Object" +#~ msgstr "Объект" + +#~ msgid "Not implemented yet." +#~ msgstr "Ещё не реализовано." + +#~ msgid "Revert" +#~ msgstr "Откатить" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Тэги (пустое значение удаляет тэг)" + +#~ msgid "Add Selected" +#~ msgstr "Добавить выбранное" + +#~ msgid "Cannot connect to server." +#~ msgstr "Невозможно связаться с сервером." + +#~ msgid "There were conflicts during import." +#~ msgstr "При импортировании возникли конфликтные ситуации." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" + +#~ msgid "Commit comment" +#~ msgstr "Комментарий правки" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " +#~ "повторите попытку позже." + +#~ msgid "Occupied By" +#~ msgstr "Объект" + #~ msgid "resolved version:" #~ msgstr "Разрешённая версия:" -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Имя пользователя (e-mail) учётной записи OSM" - -#~ msgid "OSM username (email)" -#~ msgstr "Имя пользователя OSM (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Неизвестный хост" - -#~ msgid "position" -#~ msgstr "положение" - -#~ msgid "different" -#~ msgstr "различный" - -#~ msgid "true" -#~ msgstr "истина" - -#~ msgid "false" -#~ msgstr "ложь" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Разрешить {0} конфликтов в {1} объектах" - -#~ msgid "Change" -#~ msgstr "Изменить" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Нажмите \"Обновить\" для обновления списка" - -#~ msgid "Revert" -#~ msgstr "Откатить" - -#~ msgid "Date" -#~ msgstr "Дата" +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба." #~ msgid "" @@ -23104,40 +24127,30 @@ #~ "правок." -#~ msgid "Rotate" -#~ msgstr "Вращать" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Тэги (пустое значение удаляет тэг)" - -#~ msgid "Error parsing server response." -#~ msgstr "Ошибка при разборе ответа от сервера." - -#~ msgid "Cannot connect to server." -#~ msgstr "Невозможно связаться с сервером." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki" - -#~ msgid "Tagging preset source" -#~ msgstr "Источник предустановок тегов" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Добавить новый источник предустановки тегов в список." - -#~ msgid "Tagging preset sources" -#~ msgstr "Источники предустановок тегов" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или " -#~ "повторите попытку позже." - -#~ msgid "Commit comment" -#~ msgstr "Комментарий правки" +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Ошибка при скачивании модуля: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Модуль уже существует" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Некоторые точки - (почти) на одной линии" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Подстроить положение слоя WMS" + +#~ msgid "Navigation" +#~ msgstr "Навигация" + +#~ msgid "Drawbridge" +#~ msgstr "Подъёмный мост" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "подложка Geofabrik.de" + +#~ msgid "Server does not support changesets" +#~ msgstr "Сервер не поддерживает управление версиями" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Вы действительно желаете отметить проблему, как решённую?" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -23147,79 +24160,6 @@ #~ msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM." -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" - -#~ msgid "Navigation" -#~ msgstr "Навигация" - -#~ msgid "image not loaded" -#~ msgstr "изображение не загружено" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " -#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "ID изобрадения карты Metacarta Rectifier" - -#~ msgid "rectifier id={0}" -#~ msgstr "выпрямитель id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Подстроить положение слоя WMS" - -#~ msgid "Charge" -#~ msgstr "Переодевание" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Сервер не поддерживает управление версиями" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Модуль уже существует" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Ошибка при скачивании модуля: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Некоторые точки - (почти) на одной линии" - -#~ msgid "Drawbridge" -#~ msgstr "Подъёмный мост" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "подложка Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Вы действительно желаете отметить проблему, как решённую?" - -#~ msgid "Import TCX File..." -#~ msgstr "Импортировать файл TCX..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Импортировать файл TCX как трек GPS" +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Сделать все выбранные объекты участниками отношения" #~ msgid "" @@ -23232,4 +24172,70 @@ #~ "используйте ценный пароль." +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" + +#~ msgid "Portcullis" +#~ msgstr "Опускающаяся решётка" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Проекция \"{0}\" разработана только\n" +#~ "для широт между 46.1° и 57°.\n" +#~ "Используйте другую проекцию, если не пользуетесь\n" +#~ "французским сервером WMS. Не загружайте \n" +#~ "никаких данных на сервер после этого сообщения." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Архив с модулем уже существует. Скачать текущую версию и удалить " +#~ "существующий архив?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных" + +#~ msgid "Data Layer" +#~ msgstr "Слой данных" + +#~ msgid "OSM username (email)" +#~ msgstr "Имя пользователя OSM (e-mail)" + +#~ msgid "Error parsing server response." +#~ msgstr "Ошибка при разборе ответа от сервера." + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Масштабирование: Колесо прокрутки или двойной щелчок. Сдвинуть карту: " +#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок." + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Конфликты: {0}" + +#~ msgid "image not loaded" +#~ msgstr "изображение не загружено" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" + #~ msgid "" #~ "The sources (URL or filename) of tagging preset definition files. See " @@ -23239,6 +24245,107 @@ #~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации." -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta" +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Добавить новый источник предустановки тегов в список." + +#~ msgid "Tagging preset sources" +#~ msgstr "Источники предустановок тегов" + +#~ msgid "Tagging preset source" +#~ msgstr "Источник предустановок тегов" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Импортировать файл TCX как трек GPS" + +#~ msgid "Import TCX File..." +#~ msgstr "Импортировать файл TCX..." + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "Remove Selected" +#~ msgstr "Удалить выбранные" + +#~ msgid "Basic" +#~ msgstr "Основной" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Редактор отношений: {0}" + +#~ msgid "Move Down" +#~ msgstr "Переместить вниз" + +#~ msgid "Delete and Download" +#~ msgstr "Удалить и скачать" + +#~ msgid "Move Up" +#~ msgstr "Переместить вверх" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Править подъёмный мост" + +#~ msgid "Edit Portcullis" +#~ msgstr "Править опускающуюся решётку" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы " +#~ "желаете продолжить?" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " +#~ "загруженных элементов есть история." + +#~ msgid "Helppage missing. Create it in english." +#~ msgstr "" +#~ "Страница справки отсутствует. Создайте её вenglish." + +#~ msgid "" +#~ "Helppage missing. Create it in english or your language." +#~ msgstr "" +#~ "Страница справки отсутствует. Создайте её в english " +#~ "или вашем языке." + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы " +#~ "можете настроить вручную с помощью ползунов соответствие фотографиям." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Пропуск линии потому, что она включает в себя узлы, которые не " +#~ "существуют: {0}\n" + +#~ msgid "Remove route nodes" +#~ msgstr "Удалить узлы маршрутизации" + +#~ msgid "Start routing" +#~ msgstr "Начать маршрутизацию" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Пересечения найдено. Ничего не изменялось." #~ msgid "" @@ -23291,104 +24398,9 @@ #~ "есть сомнения в лицензионных правах на изображение, то не используйте его." -#~ msgid "Portcullis" -#~ msgstr "Опускающаяся решётка" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Проекция \"{0}\" разработана только\n" -#~ "для широт между 46.1° и 57°.\n" -#~ "Используйте другую проекцию, если не пользуетесь\n" -#~ "французским сервером WMS. Не загружайте \n" -#~ "никаких данных на сервер после этого сообщения." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Архив с модулем уже существует. Скачать текущую версию и удалить " -#~ "существующий архив?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Конфликты: {0}" - -#~ msgid "viaduct" -#~ msgstr "виадук" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание" - -#~ msgid "sports" -#~ msgstr "Спортивный" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Удалить и скачать" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Пересечения найдено. Ничего не изменялось." - -#~ msgid "Solve Conflict" -#~ msgstr "Разрешить конфликт" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже " -#~ "загруженных элементов есть история." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы " -#~ "желаете продолжить?" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы " -#~ "можете настроить вручную с помощью ползунов соответствие фотографиям." - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Править подъёмный мост" - -#~ msgid "Edit Portcullis" -#~ msgstr "Править опускающуюся решётку" - -#~ msgid "Helppage missing. Create it in english." -#~ msgstr "" -#~ "Страница справки отсутствует. Создайте её вenglish." - -#~ msgid "" -#~ "Helppage missing. Create it in english or your language." -#~ msgstr "" -#~ "Страница справки отсутствует. Создайте её в english " -#~ "или вашем языке." - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "Прямо загрузить TCX файлы из JOSM." +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "ID изобрадения карты Metacarta Rectifier" + +#~ msgid "rectifier id={0}" +#~ msgstr "выпрямитель id={0}" #~ msgid "" @@ -23401,9 +24413,30 @@ #~ "загрузки на OSM. Например, удалить неинтересные части трека." -#~ msgid "Remove route nodes" -#~ msgstr "Удалить узлы маршрутизации" - -#~ msgid "Start routing" -#~ msgstr "Начать маршрутизацию" +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "Прямо загрузить TCX файлы из JOSM." + +#~ msgid "Charge" +#~ msgstr "Переодевание" + +#~ msgid "sports" +#~ msgstr "Спортивный" + +#~ msgid "viaduct" +#~ msgstr "виадук" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." + +#~ msgid "linked" +#~ msgstr "присоединенный" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Выгрузка прервана по неизвестной причине" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "Не возможно прочесть числовое знаечение из ответа" + +#~ msgid "Overlap tiles" +#~ msgstr "Накладывающиеся части" #~ msgid "" @@ -23422,16 +24455,4 @@ #~ "Не делайте выгрузку данных после данного сообщения." -#~ msgid "Cannot read numeric value from response" -#~ msgstr "Не возможно прочесть числовое знаечение из ответа" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Выгрузка прервана по неизвестной причине" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "Картинка {0} не существует или произошла ошибка чтения." - -#~ msgid "Overlap tiles" -#~ msgstr "Накладывающиеся части" - #~ msgid "% of lat:" #~ msgstr "% широты:" @@ -23440,21 +24461,18 @@ #~ msgstr "% долготы:" +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Проверка существования узла {0} в прошлом..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Восстановление удаленного отношения..." + #~ msgid "Undeleting Way..." #~ msgstr "Восстановление удаленного пути..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Проверка существования узла {0} в прошлом..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Восстановление удаленного отношения..." - #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Проверка существования примитива {0} в прошлом..." -#~ msgid "Keep mine" -#~ msgstr "Сохранить мои" - -#~ msgid "Delete mine" -#~ msgstr "Удалить мои" +#~ msgid "Selection too big" +#~ msgstr "Выборка слишком большая" #~ msgid "" @@ -23482,7 +24500,16 @@ #~ "html>" -#~ msgid "Selection too big" -#~ msgstr "Выборка слишком большая" +#~ msgid "Keep mine" +#~ msgstr "Сохранить мои" + +#~ msgid "Delete mine" +#~ msgstr "Удалить мои" #~ msgid "image loading..." #~ msgstr "изображение загружается..." + +#~ msgid "WGS84 Geographisch" +#~ msgstr "ГСК WGS84" + +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Слой{0} должен быть в списке слоев" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 16826) +++ /applications/editors/josm/i18n/po/sk.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 19:14+0000\n" -"Last-Translator: Vlado \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-29 07:45+0000\n" +"Last-Translator: zdpo \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -16,81 +16,161 @@ "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-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Vytváram hlavné grafické rozhranie ( GUI )" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" -msgstr "Nápoveda" - -#: ../core/src/org/openstreetmap/josm/Main.java:281 +msgstr "Pomocník" + +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, 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:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Neuložené zmeny" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Uložiť a Ukončiť" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Zrušiť a Ukončiť" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -99,32 +179,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Zrušiť" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem skomolenú URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Varovanie" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "NEZNÁMA" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "O aplikácii" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Zobraziť obrazovku \"O Aplikácii\"" @@ -132,10 +272,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -143,5 +283,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -150,19 +290,19 @@ msgstr "Verzia {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Posledná zmena {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java verzia {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Domovská stránka" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Správy o chybách" @@ -172,37 +312,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Informácie" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Informačné súbory" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revízia" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Príspevok" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licencia" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Pluginy" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "O programe JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Súbor nie je možné nájsť." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -214,16 +358,9 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Varovanie" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -234,7 +371,35 @@ "vybrané iba pôvodné" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Prosím vyberte riadok na odstránenie." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Vyberte buď:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Zlúčiť body" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Pridať bod..." @@ -246,14 +411,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -261,57 +428,57 @@ msgstr "Úpravy: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Zadajte súradnice nového bodu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Použite desatinné stupne." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Zemepisná šírka" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Zemepisná dĺžka" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Zarovnať body do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Presunúť označené body do kruhu" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -327,25 +494,58 @@ msgstr "Nástroj: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Vyberte minimálne 4 body" +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Zarovnať body na priamku" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Presunúť označené body na priamku" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Vyberte prosím aspoň 3 body." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -356,18 +556,10 @@ "{0}, maximálne je {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "API Capabilities Violation" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "API inicializácia neúspešná" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -378,5 +570,5 @@ "pôvodných {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -387,46 +579,46 @@ "dĺžku {2}. Dĺžka hodnôt je {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "Predpoklad Porušenia" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "údaje" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "výber" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "stiahnuté" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Priblížiť na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Priblížiť pohľad na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -436,30 +628,30 @@ msgstr "Zobrazenie: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Nie je zvolené nič, čo by se mohlo priblížiť." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Spojiť cesty patriace do rôznych vzťahov (relátion)?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -468,13 +660,13 @@ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "Aj tak spojiť" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Zmeniť smer?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -484,10 +676,10 @@ "ciest?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Otočiť a Spojiť" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -495,20 +687,20 @@ msgstr "Zadajte hodnoty pre všetky konflikty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Riešenie konfliktov" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Spojiť {0} ciest" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Všetky cesty boli prázdne" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -525,23 +717,24 @@ msgstr "Vybrať označené objekty pre vloženie." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Prosím zvoľ niečo pre kopírovanie" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Vytvoriť kružnicu" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Vytvoriť kružnicu z troch vybratých bodov." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Tieto body netvoria kružnicu." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -551,87 +744,122 @@ "alebo troma bodmi." -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Odstrániť" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Zmazať zvolené objekty." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Prepísať" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Rozložiť body rovnomerne" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Stiahnutie mapových údajov z OSM servera." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Súbor: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Stiahnuť" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "Sťahovanie odkazov z OSM..." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +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 +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:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "Boli tam {0} konflikty počas importu." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Chyby v priebehu sťahovania" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Nahrávanie nadradených z pôvodných {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplikovať" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovať výber kopírovaním a vložením." @@ -651,5 +879,5 @@ msgstr "Ukončť program." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -659,58 +887,73 @@ "GPL licencoiu." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportovať do GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportovať dáta do GPX súboru." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Nie je nič na exportovanie. Najskôr stiahnite dáta." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "paramenter ''{0}'' nesmie byť nulový" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "popis gps trasy" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Pridať informáciu o autorovi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Skutočné meno" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Preddefinované" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Kľúčové slová" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Možnosti exportu" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportovať a Uložiť" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -721,25 +964,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Chyba" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Zvoľte preddefinovanú licenciu" @@ -749,41 +972,44 @@ msgstr "JOSM Online Nápoveda" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Otvoriť v prehliadači" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Upraviť" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Znovu načítať" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Chyba pri načítaní stránky {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." @@ -791,5 +1017,5 @@ "Chýbajúca stránka s pomocou. Vytvorte to v english." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -827,30 +1053,40 @@ msgstr "Pripojiť bod k najbližšej ceste" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Spojiť body a línie" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Bez skratky" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Aj tak zlúčiť" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Spojiť vrstvy pod označenou" + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -860,69 +1096,80 @@ "chcete zlúčiť ?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Aj tak zlúčiť" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Zlúčiť {0} body" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "výber" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Aktualizovať práve vybrané pôvodné zo servera" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "Zrkadlo" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Zrkadlovo vybrané body a cesty." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Prosím vyberte aspoň jeden bod, alebo cestu." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "hore" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Presunúť objekty {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "dole" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "vľavo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "vpravo" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Presunúť {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Presunutie objektov {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Nemôžem presúvať objekty mimo svet." @@ -930,5 +1177,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nový" @@ -938,26 +1185,17 @@ msgstr "Vytvoriť novú mapu" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "nepomenované" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Otvoriť..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Otvoriť súbor." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Nemôžem čítať \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -986,35 +1224,36 @@ msgstr "Sťahovacia URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Pravouhlý tvar" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Povolené iba dva body" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Výber sa musí skladať iba z ciest" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Použili ste EPSG:4326 projekciu, ktorá môže viesť
k nežiadúcemu výsledku " @@ -1022,9 +1261,9 @@ "zbavili tohto upozornenia.
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Vybratý iba jeden bod" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Pravouhlosť" @@ -1040,11 +1279,11 @@ msgstr "Vložiť zo schránky" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Vložiť vlastnosti" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Použiť značky objektov v schránke na všetky zvolené objekty." @@ -1072,16 +1311,21 @@ msgstr "Zopakuje poslednú zrušenú akciu." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Premenovať vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Tiež premenovať súbor" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Nemôžem premenovať súbor \"{0}." @@ -1095,9 +1339,9 @@ msgstr "Otočiť smer všetkých zvolených ciest." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Zvoľte minimálne jednu cestu." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Otočiť smer ciest" @@ -1105,17 +1349,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Uložiť" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Uložiť aktuálne dáta." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Súbor {0} existuje. Prepísať ho?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1124,25 +1370,25 @@ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Prázdny dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokument neobsahuje dáta." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Uložiť akokoľvek" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikty" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1152,54 +1398,76 @@ "vyriešené, ako by boli všetky odmietnuté. Pokračovať?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Zamietnuť konflikty a Uložiť" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Uložiť OSM súbor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Uložiť GPX súbor" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Uložiť vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Nemôžem zálohovať súbor." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Neznámy typ súboru: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" +"Nastala chyba počas komunikácie so serverom
Detaily: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Počas obnovenia zálohy došlo k chybe." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Neznáma prípona súboru" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Počas ukladania došlo k chybe." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Počas obnovenia zálohy došlo k chybe." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Uložiť ako..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Uložiť aktuálne údaje do nového súboru." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Vybrať všetko" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1234,16 +1502,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Zavrieť" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Rozdeliť cestu" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Rozdeliť cestu vo zvolenom bode" @@ -1253,5 +1521,5 @@ msgstr "Tento výber nemôže byť použitý k rozdeleniu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1260,5 +1528,5 @@ msgstr[2] "Vybraté body nie sú v strede cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1277,9 +1545,9 @@ "vyberte tiež cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "Zvolené body nezdieľajú rovnakú cestu." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1288,10 +1556,10 @@ msgstr[2] "Označená cesta neobsahuje všetky vybraté body." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1301,8 +1569,9 @@ "cesty.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Funkcia zakladajúca vzťahy (relation) členov zkopírovala všetky nové " @@ -1310,13 +1579,14 @@ "Môžete preveriť správnosť, ak je to nevyhnutné." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "Vzťahy v členoch bolo skopírované do všetkých nových ciest.\n" "Mali by ste toto potvrdiť a opraviť ak je to potrebné." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1337,47 +1607,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Vyberte buď:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* Jeden označený bod, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Jeden bod používaný viac než jednou cestou, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1386,5 +1656,5 @@ "ceste, alebo" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1393,5 +1663,5 @@ "ceste." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1404,9 +1674,9 @@ "svoje vlastné kópie a všetky bodybudú vybraté." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Nepripojený bod (Unglued Node)" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1414,5 +1684,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1428,141 +1698,91 @@ msgstr "Vrátiť poslednú akciu." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Odznačiť všetko" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Odznačiť všetky objekty" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Odznačiť všetko (Focus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Odznačiť všetko (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Aktualizovať údaje" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú " -"údajovú vrstvu?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Žiadne dáta" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Chyba pri aktualizácii vybraných pôvodných." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Aktualizácia neúspešná" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "GPS dátová vrstva nie je vytvorená." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Nemôžem nájsť pôvodné s id {0} v aktuálnej dátovej sade" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Chýbajúce pôvodné" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Aktualizácia výberu" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Aktualizovať práve vybrané pôvodné zo servera" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Výber je prázdny" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Uložiť do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Uložiť všetky zmeny na OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Pridané objekty:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Upravené objekty:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Odstránené objekty:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Uložiť tieto úpravy?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Nahrať zmeny" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Žiadne zmeny pre uloženie." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Nahrávanie" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Aktualizácia pôvodných" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchronizovať {0} {1} iba" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synchronizovať celú dátovú sadu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1583,17 +1803,17 @@ "zrušenie a pokračovanie v editácii.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Zistený konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "neočakávaná hodnota. Dostal {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1608,5 +1828,5 @@ "{1} pre zrušenie a pokračovanie v editácii.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1614,58 +1834,60 @@ "Varovanie: chybné záhlavie \"{0}\" nie je zhoda s očakávanou schémou \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Aktualizácia na server neuspešná pretože vaša " -"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa je:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "Predpokladaný priestupok" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Aktualizácia neúspešná pretože pôvodné sa " -"snaží
zmazať na servery už zmazané.

Chybová správa je:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Pôvodné je už zmazané" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "Upload zlyhal.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Nahrávanie na OSM API neúspešné" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Aktualizácia pôvodných" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Uložiť všetky zmeny na OSM server." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" -"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " -"pripojenia na internet." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Pridané objekty:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Upravené objekty:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1753,42 +1975,54 @@ msgstr "Spomalené prehrávanie" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Sťahujem GPS dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Stiahnuté GPX dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Nekomprimované (Raw) GPS dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Sťahujem dáta" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, fuzzy, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Neboli importované žiadne dáta." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "údaje OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Stiahnuté {0} z {1} ({2} ostáva(left))" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Nahrávam dáta" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Nasledujúce chyby nastali behom hromadného sťahovania:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Chyby v priebehu sťahovania" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1805,21 +2039,21 @@ "servery.
Click {2}ignorovať.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Vymazané alebo presunuté pôvodné" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Režim mazania" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Zmazať body alebo cesty" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1827,5 +2061,5 @@ msgstr "Režim: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1835,774 +2069,23 @@ "nemaže body. CTRL: zmaže referenčné objekty." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Kresliť" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Kresliť body" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Režim: Kresliť Fokus" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "zvolené" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Pridať bod" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Pridať bod do cesty" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Pripojiť existujúcu cestu do bodu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -msgid "Add node into way and connect" -msgstr "Pridať bod do cesty a spojiť" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "Vytvoriť nový bod." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Zvoliť bod pod kurzorom." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Vložiť nový bod do {0} ciest." -msgstr[1] "Vložiť nový bod do cesty." -msgstr[2] "Vložiť nový bod do {0} ciest." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Pokračovanie cesty z posledného bodu." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Koniec kreslenia." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Vyťiahnuť (extrude)" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Vytvoriť plochy" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Vyťiahnuť cestu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Pustite tlačítko myši k zastaveniu otáčania" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Ťahajte segment cesty na vytvorenie pravouholníka." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový " -"záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Výber" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Zvoliť, posunúť a otáčať objekty" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Pridať a posunúť virtuálny nový bod do {0} ciest" -msgstr[1] "Pridať a posunúť virtuálny nový bod do cesty" -msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Posunúť elementy" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" -"Presunuli ste viac ako {0} objektov. Presun veľkého množstva objektov je " -"často chyba.\n" -"Skutočne ich presunúť?" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "Posunúť ich(them)" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "Krok späť posun" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Posunúť objekty ťahaním; Shift pridá do výberu (Ctrl na prepínanie); Shift-" -"Ctrl na otáčanie výberu; alebo zmenu výberu" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zväčšenie" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Priblížiť/Vzdialiť a pohyb mapy" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Približovanie pomocou ťahania alebo CTRL+. alebo CTRL+,; pohyb s CTRL+šípka " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Vyhľadávať..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Vyhľadávať objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Neboli načítané žiadne dáta." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Zadajte hladaný reťazec." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "nahradiť označené" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "pridať k výberu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "odobrať z výberu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "veľkosť písmen rozhoduje" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regulárny výraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' v akomkoľvek kľúči, alebo mene." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -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:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"typ=* - kľúč 'typ' s nejakou hodnotou. Skúste tiež *=hodnota, " -"typ=, *=*, *=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - neobsahuje 'Bak' v mene." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -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:91 -msgid "Special targets:" -msgstr "Špeciálne ciele:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - typy objektov (bod, cesta, vzťah(relácia))" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - objekt s pridaným ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -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:96 -msgid "modified - all changed objects" -msgstr "modified - všetky zmenené objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - všetky vybraté objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - všetky nekompletné objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "untagged - všetky neoznačené objekty" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -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:101 -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:102 -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:103 -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:104 -msgid "Use ( and ) to group expressions" -msgstr "Použite ( a ) k zoskupeniu výrazov" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Hľadať" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Začať vyhľadávanie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, 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:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Najdených {0} zodpovedajúcich výrazov" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Regulárny výraz \"{0}\" má chybu na pozícii {1}, celá chyba:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" -"Kľúč nemôže byť prázdna hodnota keď je použitý značkový operátor. Ukážka " -"použitia: kľúč=hodnota" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" -"Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "Neočakávaná značka: {0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Chýbajúci argument pre \"alebo\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Chýbajúci argument pre \"NOT\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Očakávam uzatváraciu zátvorku." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "Zlé číslo parametrov pre operátor bodov." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"Nesprávna hodnota operátora bodov: {0}. Operátor bodov čaká čísla bodov, " -"alebo rozsah bodov, napr. body:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "Nesprávna hodnota pre id operátor: {0}. Číslo je očakávané." - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontakt {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Sťahujem ..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Nemôžem čítať z URL:\"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Chyba parsovania v URL:\"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Chyba počas komunikácie so serverom" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "Pridať {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "Zmeniť {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Odstranené \"{0}\" pre {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Nastavené {0}={1} pre {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekty" -msgstr[2] "objektov" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Odstranené \"{0}\" pre {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Nastavené {0}={1} pre {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "Zmena funkcie relačného člena pre {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "Vyriešte rozpor v súradniciach v {0}" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "nemôžem vyriešiť nerozhodnutý konflikt" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Zmazať {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Zmazať {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Konfliktné vzťahy (relation)" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Zmazať z relácie (zo vzťahu" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Rozdeliť segment cesty" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
Toto môže spôsobiť " -"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." -"
Naozaj ich chcete zmazať?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "Vyriešte konflikty v zmazaných (state) v {0}" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Presunúť" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "bod" -msgstr[1] "body" -msgstr[2] "bodov" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "Vyčistenie 1 pôvodného" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "vybranie odkazu z cesty {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" -"Varovanie: Vyčistená cesta {0} pretože množstvo bodov sa znížilo 2. Aktuálne " -"je {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "vybranie odkazu z relácie {0}" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "Rozhodnutie konfliktov v member list of relation {0}" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, 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 -#, java-format -msgid "Rotate {0} {1}" -msgstr "Otočiť {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Sekvencia" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Vyriešte konflikt verzií pre {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Vyriešte konflikt v poradí bodov v ceste {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "Hlavná dátová sada neobsahuje bod {0}" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Použiť?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov " -"sú navrhované v takom poradí aby zachovali konzistenciu dát." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Vzťah (relation)" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Stará funkcia" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nová funkcia" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Starý kľúč" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Stará hodnota" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nový kľúč" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nová hodnota" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Použiť zvolené zmeny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Neurobiť zmeny" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Vlastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "Funkcie vo vzťahoch (relations) odkazujú na" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatická úprava značiek (tag)" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, 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:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Predvoľby uložené na {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Nemôžem nahrať predvoľby zo servera." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "práve zapísaný má konflikt s pôvodným ''{0}''" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2614,8 +2097,812 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "parameter ''{0}'' nesmie byť nulový" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Kresliť" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Kresliť body" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "zvolené" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Pridať bod" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Pridať bod do cesty" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Pripojiť existujúcu cestu do bodu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +msgid "Add node into way and connect" +msgstr "Pridať bod do cesty a spojiť" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "Vytvoriť nový bod." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Zvoliť bod pod kurzorom." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Vložiť nový bod do {0} ciest." +msgstr[1] "Vložiť nový bod do cesty." +msgstr[2] "Vložiť nový bod do {0} ciest." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Pokračovanie cesty z posledného bodu." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Koniec kreslenia." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Vyťiahnuť (extrude)" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Vytvoriť plochy" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Vyťiahnuť cestu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Pustite tlačítko myši k zastaveniu otáčania" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Ťahajte segment cesty na vytvorenie pravouholníka." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Ťahajte \"play head\" a uvoľnite ho blízko miesta odkadiaľ chcete zvukový " +"záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Výber" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Zvoliť, posunúť a otáčať objekty" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Pridať a posunúť virtuálny nový bod do {0} ciest" +msgstr[1] "Pridať a posunúť virtuálny nový bod do cesty" +msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Posunúť elementy" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Presunuli ste viac ako {0} objektov. Presun veľkého množstva objektov je " +"často chyba.\n" +"Skutočne ich presunúť?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Posunúť ich(them)" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Krok späť posun" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Posunúť objekty ťahaním; Shift pridá do výberu (Ctrl na prepínanie); Shift-" +"Ctrl na otáčanie výberu; alebo zmenu výberu" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zväčšenie" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Priblížiť/Vzdialiť a pohyb mapy" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Približovanie pomocou ťahania alebo CTRL+. alebo CTRL+,; pohyb s CTRL+šípka " +"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:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Vyhľadávať..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Vyhľadávať objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Zadajte hladaný reťazec." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "nahradiť označené" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "pridať k výberu" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "odobrať z výberu" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "veľkosť písmen rozhoduje" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regulárny výraz" + +#: ../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." + +#: ../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 +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 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"typ=* - kľúč 'typ' s nejakou hodnotou. Skúste tiež *=hodnota, " +"typ=, *=*, *=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Špeciálne ciele:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - typy objektov (bod, cesta, vzťah(relácia))" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +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: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 +msgid "modified - all changed objects" +msgstr "modified - všetky zmenené objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - všetky vybraté objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - všetky nekompletné objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "untagged - všetky neoznačené objekty" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +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: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 +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 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Hľadať" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Začať vyhľadávanie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Najdených {0} zodpovedajúcich výrazov" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Regulárny výraz \"{0}\" má chybu na pozícii {1}, celá chyba:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" +"Kľúč nemôže byť prázdna hodnota keď je použitý značkový operátor. Ukážka " +"použitia: kľúč=hodnota" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" +"Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "Neočakávaná značka: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Chýbajúci argument pre \"alebo\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Chýbajúci argument pre \"NOT\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Očakávam uzatváraciu zátvorku." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Zlé číslo parametrov pre operátor bodov." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"Nesprávna hodnota operátora bodov: {0}. Operátor bodov čaká čísla bodov, " +"alebo rozsah bodov, napr. body:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "Nesprávna hodnota pre id operátor: {0}. Číslo je očakávané." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Nahrať výber" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontakt {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Chyba parsovania v URL:\"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +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}" +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}''" +msgstr "Odstranené \"{0}\" pre {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekty" +msgstr[2] "objektov" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Odstranené \"{0}\" pre {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Nastavené {0}={1} pre {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Zmena funkcie relačného člena pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Riešiť konflikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, fuzzy, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "práve zapísaný má konflikt s pôvodným ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Neboli nájdené záznamy pre \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "Vyriešte rozpor v súradniciach v {0}" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "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 +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?" +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:584 +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?" +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:402 +msgid "Split way segment" +msgstr "Rozdeliť segment cesty" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Chystáte sa zmazať body mimo Vami stiahnutú oblasť.
Toto môže spôsobiť " +"problém iným objektom (nevidíte ich), ktoré môžu používať tieto body." +"
Naozaj ich chcete zmazať?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Zmazať z relácie (zo vzťahu" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "Vyriešte konflikty v zmazaných (state) v {0}" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Presunúť" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "bod" +msgstr[1] "body" +msgstr[2] "bodov" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "Vyčistenie 1 pôvodného" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "vybranie odkazu z cesty {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" +"Varovanie: Vyčistená cesta {0} pretože množstvo bodov sa znížilo 2. Aktuálne " +"je {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "vybranie odkazu z relácie {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Otočiť {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Sekvencia" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Vyriešte {0} konfliktov značiek v {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Vyriešte konflikt verzií pre {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Vyriešte konflikt v poradí bodov v ceste {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "Hlavná dátová sada neobsahuje bod {0}" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Použiť?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov " +"sú navrhované v takom poradí aby zachovali konzistenciu dát." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Vzťah (relation)" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Stará funkcia" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nová funkcia" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Starý kľúč" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Stará hodnota" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nový kľúč" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nová hodnota" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Použiť zvolené zmeny" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Neurobiť zmeny" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Vlastnosti " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "Funkcie vo vzťahoch (relations) odkazujú na" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatická úprava značiek (tag)" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Predvoľby uložené na {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Nemôžem nahrať predvoľby zo servera." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "práve zapísaný má konflikt s pôvodným ''{0}''" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2643,5 +2930,5 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2650,27 +2937,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "neúplný" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Varovanie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "body" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2679,13 +2966,13 @@ msgstr[2] "ciest" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "cesty" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2694,22 +2981,22 @@ msgstr[2] "vzťahov (relations)" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relácie" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "changeset" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "changesets" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2724,23 +3011,23 @@ msgstr[2] "{0} členov" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "komunikácie" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vodný tok" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "využitie oblasti (landuse)" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2796,5 +3083,5 @@ msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Cesta označená ako plocha nie je uzavretá." @@ -2935,9 +3222,4 @@ "Zostávajú moje pôvodné. " -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2954,5 +3236,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "pozadie" @@ -2963,8 +3245,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "WGS84 Geographisch" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "WGS84 Zemepisné" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2980,5 +3262,5 @@ "a začnite v novej vrstve a v novej zóne." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambertova zóna (Francie)" @@ -3001,22 +3283,140 @@ msgstr "UTM Zone {0}" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Nemôžem prečítať záložky." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Nemôžem zapísať do záložiek." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../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:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" +"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " +"pripojenia na internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Aktualizácia na server neuspešná pretože vaša " +"aktuálna
dátová sada nespĺňa predpoklad.
Chybová správa je:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Predpokladaný priestupok" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "neznámy" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Neočakávaná chyba programu." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k " +"internetu." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n" +"Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho " +"pripojenia na internet." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Neznámy hostiteľ" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Aktualizácia neúspešná pretože pôvodné sa " +"snaží
zmazať na servery už zmazané.

Chybová správa je:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "Pôvodné je už zmazané" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, fuzzy, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Správu dňa nie je možné zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- teraz používaná verzia je {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Sťahujem \"Správu dňa\"" @@ -3098,62 +3498,57 @@ msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, 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/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "použitie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Zobrazí túto nápovedu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Štandardný unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Stiahnuť ohraničujúcí box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Otvoriť súbor (as raw gps, if .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Výber s určeným hľadaním" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Spustiť v maximalizovanom režime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Nastaviť východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Nastaviť jazyk." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "príklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3164,51 +3559,51 @@ "nejaké dáta predtým--výber" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Namiesto --download= môžete zadať osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktivujem aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Načítavam skoršie pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Nastavujem východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Načítavam pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3216,21 +3611,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Prepnúť drôtový model" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Celá obrazovka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Prepínač pohladu na celej obrazovke" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Zvuk" @@ -3274,53 +3669,68 @@ msgstr "mierka" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Zemepisná dĺžka na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Meno objektu na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Zemepisná šírka na mieste kurzoru myši." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Uhol medzi predchádzajúcim a súčasným úsekom cesty." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Bude zobrazená smerová šípka v segmente línie." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Dĺžka nového nakresleného segmentu trasy bude zobrazená." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(žiadny objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "vrstva nie je v zozname" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, 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/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Pripája sa na OSM server..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "Vrstva ''{0}'' musí byť v zozname vrstiev" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Chyba pri rozkladaní" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3342,4 +3752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Prebieha inicializácia" @@ -3371,20 +3782,20 @@ msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3392,30 +3803,30 @@ msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Členovia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "Nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "Značky({0} konfliktov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "Body(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -3424,17 +3835,17 @@ "tejto ceste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "Body(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "Členy(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3444,25 +3855,25 @@ "tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "Členy(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyriešené konflikty v zozname členov v tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "Nevyriešený konflikt vo vlastnostiech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konfliktmi)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "Nebyriešený konflikty vlastností musia byť vyriešené" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "Rozhodnutie konfliktov" @@ -3499,5 +3910,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "Moja verzia" @@ -3508,5 +3919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3522,5 +3933,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "Ich verzia" @@ -3606,7 +4017,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3687,14 +4097,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "parameter '{0}' nesmie byť nulový" @@ -3725,10 +4135,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "neočakávaný index stĺpca. Got {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3738,19 +4148,19 @@ "Nastala chyba počas komunikácie so serverom
Detaily: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "Spojenie so serverom zlyhalo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Áno, obnoviť ich tiež" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nie, zrušiť operáciu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3761,9 +4171,9 @@ "servery.

Chcete obnoviť tieto body tiež?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Obnoviť pridané body?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3775,13 +4185,13 @@ "servery.

Chcete ich obnoviť tiež?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "Obnoviť pôvodné závislé odkazy?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Vlastnosti v mojej dátovej sade, i.e. lokálna dátová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3791,90 +4201,90 @@ "elementoch, keď rozhodnutie o spojenie bude aplikované." -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Vlastnosti v ich dátovej sade, i.e. serverova dátova sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "Súradnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "Vymazaný stav:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "Viditeľný Stav:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(žiadny)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "zmazané" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "nevymazaný" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "viditeľné (na servery)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "neviditeľné (na servery)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "Zostáva klon lokálnej verzie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "Fyzicky vymazať z lokálnej verzie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "Ponechaj moje súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "Ponechaj ich súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnuté konflikty medzi rôznymi súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "Udržať môj vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "Udržať ich vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "Nevyriešené konflikty medzi vymazávaným stavom" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "Zostáva môj viditeľný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "Áno, vynulovať id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "Nie, zrušiť" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3887,5 +4297,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "Nastaviť id na 0" @@ -3912,12 +4322,11 @@ msgstr "Odstrániť z dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3963,10 +4372,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3975,10 +4384,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3987,5 +4396,5 @@ msgstr "Hodnota" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "nie je možné použiť neistú značku pri spojovaní prvkov" @@ -4045,9 +4454,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -4055,5 +4464,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4085,6 +4494,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." @@ -4093,35 +4502,39 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "Rozhodnutie konfliktov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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 "Zrušiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "Použiť rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "Použiť čiastočné rozhodnutie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Pokračovať akokoľvek" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "Pokračovanie rozhodnutia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"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 "" "Nemôžete ukončiť rozhodnutie pre všetky konflikty.
Kľuk {0}" @@ -4130,4 +4543,17 @@ "riešenia konfliktov." +#: ../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 "Rozhodnutie konfliktov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Vyriešte konflikt verzií pre {0} {1}" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 @@ -4144,96 +4570,130 @@ msgstr "Chybný priebeh nahrávania zo servera. Detaily:
{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, 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:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "Položka priebehu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../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:410 +#: ../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:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "Ukázať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "Zobraziť priebeh z vybraných pôvodných" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Vrstvy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Odstrániť vybranú vrstvu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Sú tu neuložené zmeny. Napriek tomu zmazať vrstvu?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Vymazať vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Naozaj chcete zmazať celú vrstvu?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informácia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "áno" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Odstrániť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Zmazať {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Zobraziť/Skryť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Prepnúť viditeľnosť zvolenej vrstvy." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Zobraziť/Skryť Text/Ikony" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Prepínač zobrazovania značiek textu a ikon." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Vrstvy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "private (len pre vlastníka)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Odstrániť vybranú vrstvu." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Spojiť vrstvy pod označenou" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Presunúť zvolenú vrstvu o riadok hore." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Presunúť zvolenú vrstvu o riadok dole." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Spojiť vrstvy pod označenou" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Vrstvy: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Informačná tabuľa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4243,22 +4703,28 @@ msgstr[2] "Toto zmení až {0} objekty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Prázdna hodnota zmaže klúče" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Zmeniť hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4268,84 +4734,89 @@ msgstr[2] "Zmeniť vlastnosti až {0} objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Vyberte prosím kľúč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Vlastnosti/Členstvo(memberships)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Vlastnosti pre zvolené objekty" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Zmeniť reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Naozaj zmazať výber z relacie {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Pridať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Pridať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Upraviť vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Zmazať vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Zmaže zvolený klúč vo všetkých objektoch" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Vlastnosti / Memberships" @@ -4354,63 +4825,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Otvoríť zoznam všetkých relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Otvoriť editor pre zvolenú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Zmazať vybraté relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Vytvoriť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relácie: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Otvoriť editor pre zvolenú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Zmazať vybraté relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Súčasný výber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Otvoriť výber obsahu okien." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Priblížiť na vybraté elementy(s)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Obnoviť obsah výberu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Priblížiť na výber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Výber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4420,5 +4893,5 @@ msgstr[2] "{0} cesty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4428,5 +4901,5 @@ msgstr[2] "{0} relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4437,5 +4910,10 @@ msgstr "Uvoľniť panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4444,144 +4922,426 @@ "lište." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Autori (spracovatelia)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Autor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Autori(spracovatelia): {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +#, fuzzy +msgid "Download all child relations (recursively)" +msgstr "Stiahnuť členov relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Stiahnuť plochu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Sťahovanie týkajúcich sa relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Stiahnuť viditeľné dlaždice" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "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 +msgid "Conflicts in data" +msgstr "Konflikt v dátach" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Nie je vybraná žiadna relácia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Sťahujem Pluginy {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +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 +msgid "Parent Relations" +msgstr "Nadradené vzťahy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relácie" + +#: ../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:593 +msgid "Role:" +msgstr "Funkcia:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Odstránený Prvok z Relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" +"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:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" +"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:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" +"Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým vybraným " +"členom" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" +"Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným vybraným " +"členom" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "Editor Relácií: Odstrániť Vybrané" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "Triedenie členov relácie" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "Editor Relácií: Triedenie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +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:922 +msgid "Relation Editor: Move Up" +msgstr "Editor Relácií: Posun Hore" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +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:941 +msgid "Relation Editor: Move Down" +msgstr "Editor Relácií: Posun Dole" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "Editor Relácií: Odstrániť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Zmazať vybraté relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Pokračovanie rozhodnutia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +#, fuzzy +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" +"Relácia má zmenenú vonkajšiu z editora.
Vaša editácia nemôže byť " +"aplikovaná priamo, kvôli vytvoreniu konfliktu." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Konflikt v dátach" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Uložiť aktuálne dáta." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "Použiť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +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:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "Pridať prázdnu značku" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "Vymazať aktuálne vybrané značky" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +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:1263 +msgid "Download Members" +msgstr "Stiahnuť členov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "Editor Relácií: Sťahovanie Členov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "Nastavenie funkcie pre vybrané členy" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "Použiť Funkciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "Áno, očistiť to" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Potvrdiť činnosť vzdialenej kontroly" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Oddialiť" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "Odkazovať na" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "Spojený" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "Sťahovanie týkajúcich sa relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "zahrňujúci priame deti rodičovských(nadriadených) relácií" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "Načítať rodičovské(nadriadené) relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "Načítať aktuálne vybranú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Použiť zmeny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Základný" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Využité (kým)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "zviazané" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Posunút Hore" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Pridať všetky zvolené objekty medzi členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Pridať vybrané" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Pridať všetky zvolené objekty medzi členy" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Odstrániť označené" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "Triediť" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Posunúť dole" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Presunúť zvolenú vrstvu o riadok dolu." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Stiahnuť členov" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "Členy: {0} (spojenie: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Editor relácie: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "Stiahnuť členov relácie" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "Boli tam {0} konflikty počas importu." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "Konflikt v dátach" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, 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/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "Vytvoriť novú reláciu vo vrstve \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "Upraviť novú reláciu vo vrstve \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" msgstr "Upraviť reláciu #{0} vo vrstve \"{1}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Nahrať výber" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +#, fuzzy +msgid "Warning: ignoring exception because task was cancelled. Exception was: " +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4590,5 +5350,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4599,26 +5359,22 @@ msgstr[2] "Odstrániť staré kľúče z {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Aktualizácia vlastností {0} objektov" -msgstr[1] "Aktualizácia vlastností {0} objektu" -msgstr[2] "Aktualizácia vlastností {0} objektov" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Záložky" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Prosím najskôr zadajte požadované koordináty." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Prosím zadajte meno pre umiestnenie." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Zmeniť umiestnenie" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Najskôr zvoľte záložku" @@ -4653,35 +5409,35 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Zdroje a typy dát" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Načítať na novú vrstvu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Stiahnuť plochu" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "" "Sťahovaná plocha je príliš veľká, server zrejme odmietne vašu požiadavku" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Sťahovaná plocha je v poriadku, veľkosť je akceptovaná serverom" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Chyba null pointera, možno sú neprítomné značky" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Prosím zadajte hľadaný reťazec" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera" @@ -4689,5 +5445,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Zapíšte názov miesta pre vyhľadávanie:" @@ -4695,5 +5451,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4701,6 +5457,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "meno" @@ -4739,6 +5495,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4761,15 +5517,15 @@ msgstr "typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "blízko" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zväčšenie" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4781,5 +5537,5 @@ "klávesy. Vybrať: Click." -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Slippy map" @@ -4811,5 +5567,11 @@ msgstr "Priebeh (History) pre {0} {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "Zavrieť dialógové okno" @@ -5552,5 +6314,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5719,59 +6481,59 @@ msgstr "Verzia" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Obrázky pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Čítať GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Žiadny čas pre bod {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Nenájdené žiadne obrázky s časovými značkami." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Čítam {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Obrázky s GPS súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Štart GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Koniec GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "súčastná odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "rozdiel časových pásiem: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5780,138 +6542,128 @@ msgstr[2] "obrázkov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} vo vnútry stopy (track)." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synchronizovať hodiny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Dáta v súbore \"{0}\" nemohli byť parsované." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V súbore \"{0}\" nie je časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Obrázok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizovať čas s GPS zariadením" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Zadaný čas nemôže byť rozparsovaný" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps poloha bodu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Prispôsobiť kresliacu trasu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Použíť globálne nastavenie." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Kresliť spojnice medzi bodmi v tejto vrstve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Výber nastavenia kreslenej čiary" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Prispôsobiť farbu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Predvolené" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Zvoľte farbu" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Značky z pomenovaných bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Pomenovanie trackpoints od {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importovať zvuk" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave Audiosúbory (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Zukové značky z {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importovať obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5921,5 +6673,5 @@ msgstr[2] "{0} stôp(track), " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5929,5 +6681,5 @@ msgstr[2] "{0} trás, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5937,30 +6689,30 @@ msgstr[2] "{0} waypointov (bodov cesty)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Meno: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Popis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Časové rozpätie: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Dĺžka: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Konvertovať do dátovej vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5970,43 +6722,43 @@ "chcete nahrať stopy (traces), pozrite sem:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Prevedené z: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Stiahnuť z OSM okolie tejto stopy (track)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metrov" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} štvorcových km" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -6017,9 +6769,9 @@ "
Chcete pokračovať?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -6029,5 +6781,5 @@ "alebo za koncom, boli vynechané, alebo presunuté na začiatok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -6037,47 +6789,47 @@ "ich času boli vynechané." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Údajová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "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:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} zmazané.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6103,5 +6855,5 @@ msgstr[2] "stopy" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6110,5 +6862,5 @@ msgstr[2] "bodov" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6118,5 +6870,5 @@ msgstr[2] "stopy s {0} bodmi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6126,5 +6878,5 @@ msgstr[2] "{0} skladá sa z {1} stôp" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6145,5 +6897,5 @@ msgstr[2] "značiek" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6153,9 +6905,9 @@ msgstr[2] "{0} pozostáva z {1} značiek" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synchronizovať audio" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." @@ -6164,20 +6916,20 @@ "synchronizácie." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Zvuk zosynchronizovaný na bode {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Nie je možné synchronizovať v už prehrávanej vrstve" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Vytvoriť Zvukovú značku v \"Play Head\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6186,5 +6938,5 @@ "Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" @@ -6192,6 +6944,13 @@ "posunutie." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Zobraziť/Skryť Text/Ikony" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Prepínač zobrazovania značiek textu a ikon." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6201,5 +6960,5 @@ "priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6209,29 +6968,29 @@ "až na track point, ktorý chcete zosynchronizovať." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Nie je možné vytvoriť novú zvukovú značku" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL bolo: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Chyba zobrazovania URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Pokročilé voľby" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Ručné nastavenie. Používajte opatrne!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6239,26 +6998,26 @@ msgstr "Hľadať: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Súčasná hodnota je východzia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Východzia hodnota je''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Prosím vyberte riadok na úpravu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6266,14 +7025,14 @@ msgstr "Nová hodnota pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Prosím vyberte riadok na odstránenie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Zadajte novú dvojicu klúč/hodnota" @@ -6409,40 +7168,40 @@ msgstr "Kalibrácia zvukového nahrávania" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farba" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Farebný štýl {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Vrstva: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Vybrať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Zvoľte farbu pre {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Zadať východzie (prednastavené)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Zadať všetko východzie (prednastavené)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Farby použité rôznymi objektami v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Farby" @@ -6785,46 +7544,55 @@ msgstr "Použitý štýl" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Nastavenie dostupných pluginov." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Stiahnuť zoznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Aktualizovať" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Konfigurovať zariadenie..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "Pridať JOSM Plugin popis URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Vyber prosím nejakú položku." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "Upraviť JOSM Plugin popis URL." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "Pridať JOSM Plugin popis URL." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "Konfigurovať umiestnenie pluginov" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Nastavenie zobrazenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6832,29 +7600,29 @@ msgstr "Rôzne nastavenia ovplyvňujúce vzhľad celého programu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Nastavenie pripojenia" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Nastavenie pripojenia pre OSM server." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Nastavenie mapy" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Nastavenie projekcie mapy a interpretácie dát." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Nastavenia zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "Nastavenia pre zvukový prehrávač a zvukové značky." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM." @@ -6959,59 +7727,61 @@ msgstr "Skratka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "Short Description: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "Autor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "Internetová stránka: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "Verzia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "Icon paths" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "Kopírovať východzie" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Vyberte riadok na kopírovanie." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "Pridať nový XML zdroj do zoznamu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Zmazať vybratý zdroj zo zoznamu." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)" @@ -7199,33 +7969,33 @@ msgstr "Skupiny modifikátorov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Viac informácii o tejto vlastnosti" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Voliteľné atribúty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Použiť prednastavenie \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "uzavratá cesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Neznány typ (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7236,15 +8006,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu(druhu) {0} sú podporované." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7255,18 +8025,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -7277,33 +8047,36 @@ msgstr "Predvolená skupina ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Pripája sa na OSM Server..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Sťahujem body {0} až {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Sťahujem OSM údaje..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Pripravujem dáta..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Nemôžem čítať \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7311,21 +8084,21 @@ msgstr "GPX súbory" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Značky z {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "Súbor \"{0}\" neexistuje" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7343,5 +8116,19 @@ "pôvodných" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "Sťahujem OSM údaje..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." @@ -7349,5 +8136,10 @@ "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7357,44 +8149,43 @@ "pre každý pôvodný" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 súbory" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Importované súradnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Poškodené údaje(vety): " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Chyby v kontrolnom súčte: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Neznáme údaje(vety): " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Nulové súradnice: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA import úspešný" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA import zlyhal!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" @@ -7402,5 +8193,5 @@ "nastaveniach." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7411,15 +8202,15 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7429,23 +8220,36 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Otváranie kontroly..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Zatváranie kontroly..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "Nie sú prítomné zmenené súbory(changeset) pre diff nahratie." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Pripravujem..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Nahrávam..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Prehľadávam adresár {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7489,9 +8293,4 @@ msgstr "Prihlásenie" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Prerušujem..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7550,66 +8349,70 @@ "dostáva ''{1}''" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "Rozloženie OSM history data ..." + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Chyba v priebehu parsovania" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "Súbory OSM Servera" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Neznáma verzia" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "Chýba číslo verzie z OSM údajov" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "Neznáma verzia: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Nájdený element mimo cesty." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " má nulový ref" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Nájdený element mimo relácie." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "Chýba atribút \"ref\" člena relácie {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "Neplatné hodnota atribútu \"ref\" člena relácie {0} (hodnota {1})" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "Chýba atribút \"type\" člena {0} relácie {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "Neočakávaný \"type\" člena {0} relácie {1} (hodnota {2})" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Nekompletné špecifikácie s ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Neplatný objekt s id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7618,46 +8421,68 @@ "Neplatná hodnota atribútu \"version\" v OSM elemente s id {0} (hodnota {1})" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "Chýba atribút \"version\" v OSM elemente s id {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Chýba povinný atribút \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, fuzzy, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" +"značená cesta {0} je neúplná pretože odkazované body chýbajú v načítaných " +"dátach" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Pripravujem OSM údaje..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Zle formulované id bodu" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "parameter ''{0}'' > 0 požadovaný. Got {1}" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "Sťahovanie odkazovaných ciest ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "Sťahovanie odkazovaných relácií ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "História sťahovania..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Kontaktujem server..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "Neúspešné nadviazanie spojenia do API {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7666,5 +8491,18 @@ "internetu." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7676,16 +8514,11 @@ "Ignorujem zmenu nastavení." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} ostáva. Odosielam {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Aktualizácia pluginov" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Stiahnuť pluginy" @@ -7702,5 +8535,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7710,23 +8543,23 @@ msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "Sťahujem Pluginy {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "Vynechať sťahovanie" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM verzia {0} požadovaná pre plugin {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "Stiahnuť Plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "Vynechať Sťahovanie" @@ -7737,34 +8570,32 @@ msgstr "Nastala chyba v plugine {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Upozornenie - bolo požadované nahratie pluginu {0}. Tento plugin už nie je " "potrebný." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Plugin nenájdený: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Pluginy boli naposledy aktualizované pred {0} dňami." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7774,21 +8605,21 @@ "the config option 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Vypnúť doplnok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Zachovať plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7798,5 +8629,5 @@ "ich prepísaniu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7805,10 +8636,10 @@ "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Podľa informácie v doplnku jeho autorom je ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7816,9 +8647,9 @@ "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Vypnúť doplnok?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7828,27 +8659,23 @@ "prestal používať." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme vývojárov " -"JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informácia" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Nenájdené informácie o plugine" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Popis nedostupný" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "Viac detailov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7858,13 +8685,18 @@ msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Nenájdené informácie o plugine" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "Plug-in {0} nie je dostupný. Aktualizácia preskočená." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 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:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7877,9 +8709,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Stiahnuť chýbajúca pluginy" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7892,57 +8724,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "neznámy" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Verzie {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Plugin je zahrnutý v JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Chyba čítania súboru informací o plugine: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Toto je až za koncom nahrávky" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Chyba prehrávánia zvuku" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Neurobiť nič" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Nahlásiť chybu" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7956,18 +8766,18 @@ "chybe." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Neočakávaná chyba programu." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosíme napíšte chybovú správu v {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Opíšte (detailne) kroky, ktoré vedú k chybe." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7977,17 +8787,33 @@ "hlásením chyby." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Prosím pripojte nasledujúcu informáciu:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Text už bol skopírovaný do schránky.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Nezobrazovať v budúcnosti" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -8000,5 +8826,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -8008,5 +8834,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -8017,13 +8843,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Pomoc: Skratky môžeš modifikovať v nastaveniach)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Vytvoriť cestnú sieť" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -8033,21 +8874,21 @@ "jeden spoločný" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Vybrať dve cesty s so spoločným bodom" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "Vybrať dve cesty bez spoločného bodu" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Vytvoriť cestnú sieť" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Nahrať stopu" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -8055,74 +8896,75 @@ msgstr "Nahrať Stopy (Traces)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Verejné" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Popis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Prosím zapíšte popis a vašej stope(trace)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "Prosím zapíšte značky o vašej stope(trace)" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Vybratá stopa: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Pripájam sa..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Nahrávanie je zrušené" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Chyba počas nahrávania" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Nahratie GPS stopy bolo úspešné" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Chyba pri nahrávaní. Server napísal nasledujúcu správu: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Nahrávam GPS stopu(track): {0}% ({1} of {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Nie je poskytnutý žiaden popis. Prosím doplňte nejaký popis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Nie je vybratá GPX vrstva. Nemôžem nahrať stopu (trace)." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Nie je doplnené užívateľské meno." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Nie je doplnené heslo." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Nahrávam GPX stopu (track)" @@ -8192,33 +9034,34 @@ msgstr "Niektorý z vybratých súborov bol prázdny !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Čítať fotky..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Nemôžem získať cestu pre adresár {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Prehľadávam adresár {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Nájdený prázdny súbor v adresári {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Chyba pri získavaní súború z adresára {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Zladiť GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8238,15 +9081,15 @@ msgstr "Súbory GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Chyba pri rozkladaní {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8258,34 +9101,34 @@ "html>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Čas fotografie (z exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "GPS čas (čítaj nad fotografiou) " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Som v časovej zóne: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Žiaden dátum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Otvoriť inú fotografiu" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synchronizovať čas z fotky a GPS prímača" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8295,70 +9138,70 @@ "Prosím použite požadovaný formát." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Neplatný dátum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX stopa(trasa): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Otvoriť inú GPX stopu(trasu)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Časové pásmo: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Vyrovnať(Offset):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" "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:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Aktualizovať pozíciu pre: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Všetky obrázky" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Obrázky bez exif pozície" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Zatiaľ neoznačkované obrázky" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Zladiť obrázky s GPX stopou(track)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Zladiť" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Auto-Guess" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Môžete vybrať GPX stopu(track)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Nevybratá GPX stopa(track)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8369,9 +9212,9 @@ "Čakám na formát: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Neplatné časové pásmo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8382,65 +9225,65 @@ "Čakám na formát: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Neplatné vyrovnanie (offset)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Najdené {0} zhody z {1} v GPX stope {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "Nahratá GPX stopa(trasa)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "Vybraté fotografie neobsahujú informácie o čase." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Fotografie neobsahujú informácie o čase." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX Stopa nemá informáciu o čase." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Časové pásmo: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minút: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekúnd: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Zladené {0} z {1} fotiek k GPX stope." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Časový rozdiel z {0} dní)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8450,13 +9293,13 @@ "posúvač ručne na fotky." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Priraďovanie fotiek ku stope(track) zlyhalo" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Nastaviť časové pásmo a vyváženie(offset)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Východzie hodnoty" @@ -8478,5 +9321,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" @@ -8499,6 +9342,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Nedovolená url." @@ -8679,22 +9522,22 @@ msgstr "Pridať \"source=...\" do položiek?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Sťahujem {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Kontaktujem WMS server..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Vytvoriť budovy" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8704,18 +9547,18 @@ "zvoľte pre import max. veľkosť 1 km2." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "Prosím, zapnite automatický zdroj a kontrolu štvorcov máp katastra." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "Vyberte SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Vyberte najvhodnejšie rozhranie(hranice)..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Vytvorte rozhranie(hranice)" @@ -8833,6 +9676,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Prázdna vrstva" @@ -8861,5 +9704,5 @@ msgstr "Hranice obce bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8870,9 +9713,9 @@ "Vytvorte nový súbor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Cache chýb formátov" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -8881,5 +9724,5 @@ "Lambertova zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "Cache chýb v Lambert Zóne" @@ -8969,4 +9812,9 @@ msgstr "Nemôžem duplikovať neusporiadanú cestu." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Neboli načítané žiadne dáta." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8977,9 +9825,9 @@ msgstr "Vytvoriť duplikát cesty" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Vrstva na úoravu GPX stôp(tracks)" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Konvertovať do GPX vrstvy s neznámym časom" @@ -9100,30 +9948,30 @@ msgstr "zmazať dáta po importe" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importovať dáta zo zariadenia." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importujem dáta z DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Chyba pri mazaní dát." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "importované dáta z {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Nenajdené žiadne dáta na zariadení." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Spojenie zlyhalo." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -9135,14 +9983,14 @@ "globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat Import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Importovať Dáta z Globalsat Datalogger DG100 do GPX vrstvy." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importovať" @@ -9233,40 +10081,40 @@ msgstr "Otvoriť obrázky s ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Smerový index'{0}' nenájdený" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Štartovacia poloha nebola vo vnútry bboxu" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Hľadám breh..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "Zatiaľ {0} bodov..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Chyba pri vytváraní cache adresára: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Trasovanie" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "kontrolujem cache..." @@ -9275,26 +10123,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Zapnutá vertex redukcia..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Zapnutá Douglas-Peucker approximácia..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Odstraňujem duplicitné body..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker stopa(trace)" @@ -9379,7 +10219,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "voda" @@ -9536,9 +10376,9 @@ msgstr "Nastavenie pluginu Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Sťahujem dlaždice obrázka..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Nemôžem získať obrázok" @@ -9788,18 +10628,18 @@ msgstr "Neznámy stav problému" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Otvoriť pohľad..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Otvoriť iba súbory, ktoré sú viditeľné v aktuálnom pohľade." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Žiaden pohľad nie je otvorený - nemôžem určiť hranice!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9825,33 +10665,33 @@ msgstr "Spúšťací súbor Firefoxu" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "nahrať dáta z API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "zmena výberu" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "zmena pohľadu" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "Plugin umožňujúci ovládanie JOSM z iných aplikácií." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Vzdialené ovládanie" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9863,28 +10703,28 @@ "využívajúce tento plugin." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Povolené činnosti" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Vzdialená kontrola požiadala o načítanie dát z API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Detaily požiadavky: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Chcete toto povoliť?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Potvrdiť činnosť vzdialenej kontroly" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:" @@ -10013,5 +10853,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "obrázok " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10058,5 +10898,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -10149,4 +10989,29 @@ msgid "Highlight" msgstr "Zvýrazniť" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Aktualizácia vlastností {0} objektov" +msgstr[1] "Aktualizácia vlastností {0} objektu" +msgstr[2] "Aktualizácia vlastností {0} objektov" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" +"INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.getCurrentDataSet" +"()" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" +"Nečakaná verzia JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found." #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10401,34 +11266,34 @@ msgstr "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "Vložiť Šírku/Dĺžku pre skok na miesto." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "Môžete tiež vložiť nejakú URL z www.openstreetmap.org" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zväčšenie (v metroch)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Skok tam" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Skok na miesto (pozíciu)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Niesom schopný vyčítať Šírku/Dĺžku" @@ -10461,6 +11326,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Overovanie chýb" @@ -10470,10 +11335,10 @@ msgstr "Žiadne chyby na overenie" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Mriežka" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10566,23 +11431,15 @@ msgstr "Vykonať overovanie dát" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Dáta majú chyby. Ak napriek tomu ich nahrať?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Otvoriť okno pre overovanie." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Priblížiť na problém" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Overiť" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10655,22 +11512,22 @@ msgstr "Zkrížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Duplicitné body" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Duplikované body v ceste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Skontroluje cesty či neobsahujú identické body za sebou." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Duplicitné body v ceste" @@ -10747,23 +11604,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:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Kontrola vlastností :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Tento plugin kontroluje chyby kľúčov a ich hodnôt." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Neplatný tagchecker line - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Neplatný spellcheck line: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10774,7 +11631,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Neplatná kombinácia klúča/hodnoty" @@ -10782,79 +11639,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Problém s vykresľováním" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Klúč ''{0}'' je neplatný." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Klúče s prázdnými hodnotami" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Neplatné vlastnosti kľúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Neplatná medzera vo vlastnosti klúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Hodnota začíná alebo končí medzerou" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Hodnota obsahuje HTML entitu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "Kľúč ''{0}'' nie je predvolený." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "Predvoľba neobsahuje vlastnosti kľúča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je predvolená." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "Predvoľba neobsahuje vlastnost hodnoty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Kontrola vlastností kľúčov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Kontroluje platnosť vlastností kľúčov proti zoznamu slov." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Použíť komplexnú kontrolu vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" "Kontroluje platnosť hodnôt a tagů(značiek) pomocou komplexných pravidel." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "TagChecker source" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10865,82 +11724,82 @@ "značiek." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Pridať nový zdroj do zoznamu." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Upraviť zvolený zdroj." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Zdroje dát" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Kontrola vlastností hodnôt ." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Kontroluje platnosť vlastností hodnôt proti prednastaveným hodnotám." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Kontrola pre FIXMES." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Pohľad pre body, alebo cesty s FIXME v hodnotách vlastností." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Kontrola pre poznámky (notes)" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Kontrola či pri kreslení mapy nevznikli chyby." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Použite štandardný dátový súbor." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Použite štandardný dátový súbor (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "Použite východzie značky ignorovaného súboru." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "Použite východzie značky ignorovaného súboru (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Použite štandardný spellcheck súbor." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Použite štandardný spellcheck súbor (doporučené)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Oprava vlastností" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Nemôžem nájsť typ elementu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Nemôžem nájsť úroveň varovania." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Neplatný výraz ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -11087,7 +11946,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "budovy" @@ -11101,5 +11960,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "oblasť(plocha)" @@ -11133,10 +11992,10 @@ msgstr "Spojený koncový bod cesty je blízko inej cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Neotagované(neoznačené) a nespojené body." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11192,8 +12051,34 @@ msgstr "Obrátená zem: zem nie je na ľavej strane" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "Skenujem Mapu ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" +"Zobraz mapu ktorá bola predtým skenovaná a nahraj na walking-papers.org" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" +"Vložiť do walking-papers.org URL or ID (the bit after the ?id= in the URL)" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "Nemôžem čítať informácie z walking-papers.org the id \"{0}\"" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11204,10 +12089,10 @@ msgstr "Vybrať a spustiť body na konci cesty" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "Je dosiahnutý koniec línie" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "Je dosiahnuté spojenie" @@ -11278,14 +12163,14 @@ msgstr "Nápoveda WMS Pluginu" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Prekreslený obrázok..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "Sťahovať Rectified Images From Various Services" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11296,26 +12181,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "Obvyklý WMS Link" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "Podporovaný Rectifier Services:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "Navštívte domovská stránku" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS URL alebo Image ID:" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "Pridať Rectified Image" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11325,5 +12210,5 @@ "skúste znovu." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "Neplatná WMS URL alebo id" @@ -11333,5 +12218,5 @@ msgstr "Nastavte polohu vybratej WMS vrstvy" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11343,19 +12228,19 @@ "Môže to viesť k zlým súradniciam." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatické sťahovanie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11363,88 +12248,88 @@ "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:231 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" 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:337 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Nastavenie WMS Pluginu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Meno v menu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Meno v menu (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL (východzie)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Zadajte meno v menu a WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Skopírovať východzí" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "Stahovač:" @@ -11566,11 +12451,16 @@ "Stiahnuť GPS body z Globalsat dg100 dáta logger (drevorubez) priamo v JOSMe." +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "Visualizes routing information as a routing graph." + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11583,10 +12473,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "Pomoc pri vektorizácii WMS obrázkov." #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11596,5 +12486,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11607,5 +12497,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11618,15 +12508,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "Zobrazenie OpenLayers obrázok pozadia" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "Importovať vydania z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11636,5 +12526,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11643,5 +12533,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11652,15 +12542,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "Nechať ostatné aplikácie poslať príkaz do JOSMu." #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11671,10 +12561,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "Určiť trasové schopnosti" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11685,15 +12575,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "Povoliť pridávani značiek/bodov na aktuálnu gps pozíciu." #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Určiť dialóg pre editáciu značiek v tabuľkovej mriežke." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11706,10 +12596,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "Vytvárať radové domy mimo jednotlivých blokov." #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11721,5 +12611,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11730,5 +12620,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11739,6 +12629,15 @@ "jednotný pre názvy značiek." +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" +"Podpora sťahovaných dlaždíc, skenovaných máp z walking-papers.org. Tento " +"plugin je stále v rannom vývoji a môže obsahovať chyby." + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -11746,5 +12645,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12901,58 +13800,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12966,6 +13813,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "dialnica (motorway)" @@ -12991,6 +13838,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "cesta pre motorové vozidlá (trunk)" @@ -13016,6 +13863,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "cesta prvej triedy" @@ -13041,6 +13888,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "cesta druhej triedy" @@ -13054,5 +13901,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "cesta tretej triedy" @@ -13070,5 +13917,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "obytná (osídlená)" @@ -13102,6 +13949,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "obslužná (service)" @@ -13128,6 +13975,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "konštrukcia" @@ -13177,5 +14024,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "kruhový objazd (roundabout)" @@ -14161,5 +15008,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "močiar (marsh)" @@ -15891,27 +16738,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "šport" @@ -18755,7 +19602,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bicykel" @@ -18825,7 +19672,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "pešia (foot)" @@ -18851,5 +19698,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro (subway)" @@ -19340,13 +20187,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "zastaralý" @@ -19388,5 +20235,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "koňská (horse)" @@ -19606,4 +20453,66 @@ msgstr "prekážka" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "Cesta pre motorové vozidlá" + #. color tertiary #. @@ -19638,6 +20547,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "ulica" @@ -19693,7 +20602,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "cesta (highway_track)" @@ -19749,8 +20658,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "koľajnica (rail)" @@ -19771,5 +20680,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "služby" @@ -19783,5 +20692,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "brod" @@ -19802,5 +20711,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)" @@ -19815,5 +20724,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "miesto pohotovostnej prvej pomoci" @@ -19828,5 +20737,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "riečny breh" @@ -19840,5 +20749,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "potok" @@ -19852,5 +20761,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "dok (nakladacia rampa)" @@ -19878,5 +20787,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akvadukt" @@ -20044,13 +20953,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "človekom vytvorené (manmade)" @@ -20112,7 +21021,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "železničná výhybka" @@ -20135,10 +21044,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "iná koľaj" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "nadchod nad železnicou" @@ -20174,7 +21083,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "historická železnica(turistická)" @@ -20219,6 +21128,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "letecké cesty" @@ -20232,5 +21141,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminál" @@ -20252,5 +21161,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "zjazdovka_čierna" @@ -20264,5 +21173,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "zjazdovka_ľahká" @@ -20310,7 +21219,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "Visuté cesty/Lanovky" @@ -20327,5 +21236,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "mierna zjazdovka (piste_easy)" @@ -20340,5 +21249,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "stredne ťažká zjazdovka (piste_intermediate)" @@ -20353,5 +21262,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "zjazdovka pre pokročilých (piste_advanced)" @@ -20366,5 +21275,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "zjazdovka pre expertov (piste_expert)" @@ -20379,5 +21288,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "zjazdovka pre freeride (piste_freeride)" @@ -20392,5 +21301,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "zjazdovka pre začiatočníkov (piste_novice)" @@ -20495,10 +21404,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "energia (power)" @@ -20512,5 +21421,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "hrádza (pier)" @@ -20524,5 +21433,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "potrubie (pipeline)" @@ -20650,12 +21559,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "oddych (leisure)" @@ -20669,5 +21578,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "prístav (marina)" @@ -20739,8 +21648,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "zaujímavosti (amenity)" @@ -20842,10 +21751,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "verejná_doprava" @@ -21231,22 +22140,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "svetelné zariadenie" @@ -21278,6 +22187,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "osvetlená_voda (light_water)" @@ -21338,8 +22247,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "zdravie" @@ -21692,26 +22601,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "obchod" @@ -21783,8 +22692,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21934,9 +22843,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "cestovanie" @@ -22008,8 +22917,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historické" @@ -22080,8 +22989,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "zelená" @@ -22095,5 +23004,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "lom" @@ -22107,5 +23016,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "skládka odpadov (landfill)" @@ -22127,5 +23036,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody" @@ -22139,5 +23048,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "les" @@ -22151,5 +23060,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "farmy" @@ -22172,5 +23081,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "maloobchody" @@ -22184,5 +23093,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "závody" @@ -22196,5 +23105,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "brownfield (opustený priemyselný objekt)" @@ -22208,5 +23117,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)" @@ -22220,5 +23129,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "železničný pozemok" @@ -22275,7 +23184,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "armáda" @@ -22289,5 +23198,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "cintorín (cemetery)" @@ -22300,5 +23209,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "vrchol (peak)" @@ -22313,5 +23222,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "ľadovec (glacier)" @@ -22325,5 +23234,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "sopka" @@ -22378,8 +23287,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "prírodné (natural)" @@ -22393,5 +23302,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "oblasť pokrytá krovím" @@ -22405,5 +23314,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "vresovisko" @@ -22417,5 +23326,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "drevo (wood)" @@ -22429,5 +23338,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "blato (mud)" @@ -22441,5 +23350,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "pláž (beach)" @@ -22517,8 +23426,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "trasa (route)" @@ -22566,7 +23475,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "hranica (boundary)" @@ -22708,10 +23617,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "miesto" @@ -22759,6 +23668,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adresa" @@ -23055,9 +23964,53 @@ msgstr "Terraserver Urban" -#~ msgid "Data Layer" -#~ msgstr "Vrstva údajov" - -#~ msgid "Uploading data" -#~ msgstr "Nahrávam dáta" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ." + +#~ msgid "API initialization failed" +#~ msgstr "API inicializácia neúspešná" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú " +#~ "údajovú vrstvu?" + +#~ msgid "No data" +#~ msgstr "Žiadne dáta" + +#~ msgid "Failed to update the selected primitives." +#~ msgstr "Chyba pri aktualizácii vybraných pôvodných." + +#~ msgid "Update failed" +#~ msgstr "Aktualizácia neúspešná" + +#~ msgid "Missing primitive" +#~ msgstr "Chýbajúce pôvodné" + +#~ msgid "Apply partial resolutions" +#~ msgstr "Použiť čiastočné rozhodnutie" + +#~ msgid "Layers: {0}" +#~ msgstr "Vrstvy: {0}" + +#~ msgid "Conflict created" +#~ msgstr "Konflikt je vytvorený" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme " +#~ "vývojárov JOSM." + +#~ msgid "Validate" +#~ msgstr "Overiť" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu." #~ msgid "Not implemented yet." @@ -23070,51 +24023,56 @@ #~ msgstr "Vyriešiť konflikty" +#~ msgid "my version:" +#~ msgstr "moja verzia:" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Aborting..." +#~ msgstr "Prerušujem..." + +#~ msgid "Change" +#~ msgstr "Zmeniť" + +#~ msgid "unnamed" +#~ msgstr "nepomenované" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste " +#~ "zmenšiť oblasť." + +#~ msgid "Commit comment" +#~ msgstr "Poslať komentár" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo posun" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Pridať všetky zvolené objekty medzi členy" + +#~ msgid "Add Selected" +#~ msgstr "Pridať vybrané" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemôžem sa pripojiť na server." + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsovania odozvy servera" + #~ msgid "There were conflicts during import." #~ msgstr "Vznikli konflikty počas importu" -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objekt je v konflikte:" -#~ msgstr[1] "{0} objekty sú v konflikte:" -#~ msgstr[2] "{0} objektov je v konflikte:" - -#~ msgid "my version:" -#~ msgstr "moja verzia:" - -#~ msgid "their version:" -#~ msgstr "verzia na servery:" - -#~ msgid "resolved version:" -#~ msgstr "finálna verzia:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Prihlasovacie meno (email) k OSM účtu." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM používateľské meno (email)" - -#~ msgid "Unknown host" -#~ msgstr "Neznámy hostiteľ" - -#~ msgid "position" -#~ msgstr "pozícia (miesto)" - -#~ msgid "different" -#~ msgstr "rôzne" - -#~ msgid "true" -#~ msgstr "áno (pravda)" - -#~ msgid "false" -#~ msgstr "nie (nepravda)" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch." - -#~ msgid "Change" -#~ msgstr "Zmeniť" +#~ msgid "Date" +#~ msgstr "Dátum" #~ msgid "Click Reload to refresh list" @@ -23123,7 +24081,4 @@ #~ msgid "Revert" #~ msgstr "Vrátiť naspäť" - -#~ msgid "Date" -#~ msgstr "Dátum" #~ msgid "" @@ -23134,123 +24089,75 @@ #~ "histórie." -#~ msgid "Rotate" -#~ msgstr "Otočiť" +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Prihlasovacie meno (email) k OSM účtu." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Chyba pri mazaní súboru pluginu: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin už existuje" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikty: {0}" #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Značky (prázdne hodnoty zmazaných značiek)" -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsovania odozvy servera" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemôžem sa pripojiť na server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo posun" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Vložte buď site-josm.xml alebo wiki stránku" - -#~ msgid "Tagging preset source" -#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu." - -#~ msgid "Tagging preset sources" -#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste " -#~ "zmenšiť oblasť." - -#~ msgid "Commit comment" -#~ msgstr "Poslať komentár" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} pluginov úspešne aktualizovaných. Prosím, reštartujte JOSM." -#~ msgstr[1] "{0} plugin úspešne aktualizovaný. Prosím, reštartujte JOSM." -#~ msgstr[2] "{0} pluginy úspešne aktualizované. Prosím, reštartujte JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}" +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objekt je v konflikte:" +#~ msgstr[1] "{0} objekty sú v konflikte:" +#~ msgstr[2] "{0} objektov je v konflikte:" + +#~ msgid "their version:" +#~ msgstr "verzia na servery:" + +#~ msgid "resolved version:" +#~ msgstr "finálna verzia:" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importovať TCX súbor ako GPS trasu" + +#~ msgid "Import TCX File..." +#~ msgstr "Importovať TCX súbor..." + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" #~ msgid "Navigation" #~ msgstr "Navigácia" -#~ msgid "image not loaded" -#~ msgstr "Obrázok nie je nahratý" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zväčšenie: Koliesko myši, alebo dvojitý kľuk. Posun mapy: Držte pravé " -#~ "tlačítko myši a hýbte myšou. Výber: Kľuk." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id" - -#~ msgid "rectifier id={0}" -#~ msgstr "prekresľovač id={0}" - #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Upraviť pozíciu WMS vrstvy" -#~ msgid "Charge" -#~ msgstr "Poplatok" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Naozaj označiť tento problém ako \"hotový\"?" + +#~ msgid "viaduct" +#~ msgstr "viadukt (nadjazd)" #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Server neobsahuje kontroly" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin už existuje" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Chyba pri mazaní súboru pluginu: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Niektoré z bodov sú (skoro) na priamke" +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" #~ msgid "Drawbridge" #~ msgstr "Padací most" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Naozaj označiť tento problém ako \"hotový\"?" - -#~ msgid "Import TCX File..." -#~ msgstr "Importovať TCX súbor..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importovať TCX súbor ako GPS trasu" #~ msgid "" @@ -23263,13 +24170,59 @@ #~ "
Nepoužívajte dôležité heslo." +#~ msgid "Rotate" +#~ msgstr "Otočiť" + +#~ msgid "Charge" +#~ msgstr "Poplatok" + +#~ msgid "different" +#~ msgstr "rôzne" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Vložte buď site-josm.xml alebo wiki stránku" + +#~ msgid "false" +#~ msgstr "nie (nepravda)" + +#~ msgid "true" +#~ msgstr "áno (pravda)" + +#~ msgid "position" +#~ msgstr "pozícia (miesto)" + #~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." #~ msgstr "" -#~ "Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. " -#~ "Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help." - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS" +#~ "Projekcia \"{0}\" je navrhnutá iba\n" +#~ "pre zemepisné šírky medzi 46.1° a 57°.\n" +#~ "Použite iný projekčný systém, ak nepoužívate\n" +#~ "francúzsky WMS server.\n" +#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zväčšenie: Koliesko myši, alebo dvojitý kľuk. Posun mapy: Držte pravé " +#~ "tlačítko myši a hýbte myšou. Výber: Kľuk." + +#~ msgid "sports" +#~ msgstr "Športový" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id" + +#~ msgid "rectifier id={0}" +#~ msgstr "prekresľovač id={0}" #~ msgid "" @@ -23321,7 +24274,4 @@ #~ "máte pochybnosť, nepoužite ho." -#~ msgid "Portcullis" -#~ msgstr "Mreže" - #~ msgid "" #~ "The plugin {0} seems to be broken or could not be downloaded " @@ -23331,16 +24281,19 @@ #~ "stiahnuť." +#~ msgid "image not loaded" +#~ msgstr "Obrázok nie je nahratý" + +#~ msgid "Portcullis" +#~ msgstr "Mreže" + +#~ msgid "Server does not support changesets" +#~ msgstr "Server neobsahuje kontroly" + #~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgstr "" -#~ "Projekcia \"{0}\" je navrhnutá iba\n" -#~ "pre zemepisné šírky medzi 46.1° a 57°.\n" -#~ "Použite iný projekčný systém, ak nepoužívate\n" -#~ "francúzsky WMS server.\n" -#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!" +#~ "Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. " +#~ "Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help." #~ msgid "" @@ -23355,16 +24308,4 @@ #~ "{0}" -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikty: {0}" - -#~ msgid "viaduct" -#~ msgstr "viadukt (nadjazd)" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie" - -#~ msgid "sports" -#~ msgstr "Športový" - #~ msgid "" #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -23372,4 +24313,13 @@ #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}" +#~ msgid "Basic" +#~ msgstr "Základný" + +#~ msgid "Remove Selected" +#~ msgstr "Odstrániť označené" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}." + #~ msgid "Delete and Download" #~ msgstr "Vymazať a Nahrať" @@ -23378,6 +24328,12 @@ #~ msgstr "Priesečník nie je najdený. Nič nebolo zmenené." -#~ msgid "Solve Conflict" -#~ msgstr "Riešiť konflikt" +#~ msgid "Move Down" +#~ msgstr "Posunúť dole" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Editor relácie: {0}" + +#~ msgid "Move Up" +#~ msgstr "Posunút Hore" #~ msgid "" @@ -23402,7 +24358,4 @@ #~ "nastaviť posúvatko na manuálne priradenie fotiek." -#~ msgid "The following errors occured during mass download:" -#~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :" - #~ msgid "Edit Drawbridge" #~ msgstr "Upraviť padací most" @@ -23410,4 +24363,13 @@ #~ msgid "Edit Portcullis" #~ msgstr "Upraviť mreže" + +#~ msgid "Tagging preset source" +#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)" + +#~ msgid "Tagging preset sources" +#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu." #~ msgid "Helppage missing. Create it in english." @@ -23434,12 +24396,27 @@ #~ "eg. vymazaním nezaujímavých častí stopy (track)" +#~ msgid "Start routing" +#~ msgstr "Začať trasovanie" + #~ msgid "Remove route nodes" #~ msgstr "Odstrániť trasové body" -#~ msgid "Start routing" -#~ msgstr "Začať trasovanie" +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} pluginov úspešne aktualizovaných. Prosím, reštartujte JOSM." +#~ msgstr[1] "{0} plugin úspešne aktualizovaný. Prosím, reštartujte JOSM." +#~ msgstr[2] "{0} pluginy úspešne aktualizované. Prosím, reštartujte JOSM." #~ msgid "Error processing changeset upload response" #~ msgstr "Chyba pri odpovedi počas nahrávania zmenených súborov." + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Niektoré z bodov sú (skoro) na priamke" + +#~ msgid "Data Layer" +#~ msgstr "Vrstva údajov" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :" #~ msgid "" @@ -23458,13 +24435,25 @@ #~ "Nenahrávajte žiadne dáta po tejto správe." +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu" + #~ msgid "Cannot read numeric value from response" #~ msgstr "Nemôžem čítať číselné hodnoty z odpovede" -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu" +#~ msgid "Occupied By" +#~ msgstr "Využité (kým)" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Pripája sa na OSM server..." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM používateľské meno (email)" #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať." +#~ msgid "linked" +#~ msgstr "zviazané" + #~ msgid "Overlap tiles" #~ msgstr "Prekryť štvorce (tiles)" @@ -23482,21 +24471,18 @@ #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got " +#~ msgid "Checking whether node {0} is gone ..." +#~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..." + +#~ msgid "Undeleting relation..." +#~ msgstr "Obnovujem reláciu..." + #~ msgid "Undeleting Way..." #~ msgstr "Obnovovanie cesty..." -#~ msgid "Checking whether node {0} is gone ..." -#~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..." - -#~ msgid "Undeleting relation..." -#~ msgstr "Obnovujem reláciu..." +#~ msgid "Keep mine" +#~ msgstr "Ponechať zdroj" #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..." - -#~ msgid "Keep mine" -#~ msgstr "Ponechať zdroj" - -#~ msgid "Delete mine" -#~ msgstr "Zmazať moje" #~ msgid "" @@ -23514,4 +24500,7 @@ #~ "pôvodný stav.
Click {3} zrušiť.
" +#~ msgid "Delete mine" +#~ msgstr "Zmazať moje" + #~ msgid "" #~ "There are {0} primitives
selected for " @@ -23533,2 +24522,17 @@ #~ msgid "image loading..." #~ msgstr "nahrávam obrázok..." + +#~ msgid "WGS84 Geographisch" +#~ msgstr "WGS84 Geographisch" + +#~ msgid "Layer {0} must be in list of layers" +#~ msgstr "Vrstva {0} musí byť v zozname vrstiev" + +#~ msgid "Sort" +#~ msgstr "Triediť" + +#~ msgid "Sort the selected relation members or the whole list" +#~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam" + +#~ msgid "Members: {0} (linked: {1})" +#~ msgstr "Členy: {0} (spojenie: {1})" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 16826) +++ /applications/editors/josm/i18n/po/sl.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:17+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-25 18:57+0000\n" +"Last-Translator: Štefan Baebler \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" @@ -17,26 +17,103 @@ "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-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Priprava grafičnega uporabniškega vmesnika" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Pomoč" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "Napaka" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" @@ -44,56 +121,59 @@ "strežnik." -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Neshranjene spremembe" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:397 +msgstr "Nekaj sprememb ni shranjenih." + +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:397 +msgstr "Shrani in končaj" + +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +msgstr "Zavrzi in končaj" + +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -102,32 +182,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Prekliči" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Pozor" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "NEZNANO" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "O programu" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Prikaži informacije o programu." @@ -135,10 +275,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -146,5 +286,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -153,19 +293,19 @@ msgstr "Različica {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Zadnja sprememba {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java različica {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Domača stran" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Prijava napak" @@ -175,37 +315,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Podrobnosti" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Preberi me" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Različica" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Prispevki" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licenca" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Vstavki" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "O JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Datoteke ni bilo moč najti." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -214,16 +358,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -232,26 +369,56 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Prosim izberite vrstico za izbris." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Izberite bodisi:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Združi vozlišča" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." -msgstr "" +msgstr "Dodaj vozlišče..." #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 msgid "Add a node by entering latitude and longitude." -msgstr "" +msgstr "Dodaj vozlišče z vpisom zemljepisne širine in dolžine" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -259,57 +426,57 @@ msgstr "Uredi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +msgstr "Vpišite koordinate novega vozlišča." + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +msgstr "Uporabi decimalne stopinje." + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo." + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +msgstr "Z. širina" + +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +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:217 msgid "Align Nodes in Circle" msgstr "Razporedi vozliša v krog" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Premakne izbrana vozlišča tako, da tvorijo krog." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -325,25 +492,58 @@ msgstr "Orodje: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Prosim, izberite vsaj 4 vozlišča." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Poravnaj vozlišča na premico" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Premakne izbrana vozlišča tako, da so na isti premici." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Prosim, izberite vsaj 3 vozlišča." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -352,18 +552,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -372,5 +564,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -379,46 +571,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "podatke" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "plast" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "izbor" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "sprejem" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Povečava na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Povečava pogleda na {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -428,30 +620,30 @@ msgstr "Pogled: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Združim poti z različnim članstvom?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -459,24 +651,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Obrnem smeri?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " "reverse some of them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +msgstr "Obrni in združi" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -484,20 +676,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +msgstr "Razreši neskladja" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Združi {0} poti" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +msgstr "Vse poti so bile prazne" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -514,23 +706,24 @@ msgstr "Kopiraj izbrane predmete v odložišče" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +msgstr "Izberite predmete, ki jih želite kopirati." + #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Ustvari krog" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Skozi izbrana tri vozlišča ustvari krog" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." +msgstr "Izbrana vozlišča niso v krogu." + +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -538,87 +731,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Izbriši" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Izbriši izbrane predmete." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Prepiši" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "Sprejem iz OSM ..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Sprejmi podatke zemljevida s strežnika OSM." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Datoteka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Sprejemanje" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Napake pri sprejemu" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Podvoji" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Podvoji izbrano z zaporednima ukazoma kopiraj in prilepi." @@ -638,64 +866,81 @@ msgstr "Zaključek dela z aplikacijo." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " "tracks." msgstr "" - +"Opomba: GPL ni združljiv z licenco OSM. Ne pošiljajte GPS sledi z licenco " +"GPL." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Izvoz v GPX ..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Izvoz v datoteko oblike GPX." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "Opis GPS sledi" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Dodaj podatke o avtorstvu" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Resnično ime" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +msgstr "E-poštni naslov" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Avtorske pravice (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Preddoločen" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Leto avtorskih pravic" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Ključne besede" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Možnosti izvoza" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +msgstr "Izvozi in shrani" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -706,25 +951,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Napaka" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Izberite preddoločeno licenco" @@ -732,48 +957,51 @@ #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50 msgid "JOSM Online Help" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +msgstr "Spletna pomoč programa JOSM" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +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:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Uredi" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Ponovno naloži" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +msgstr "Napaka pri nalaganju strani {0}" + +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -785,14 +1013,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18 msgid "History of Element" -msgstr "" +msgstr "Zgodovina elementa" #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Prikaz zgodovine poti, vozlišča ali relacije OSM." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Informacije o elementu" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -803,5 +1031,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 msgid "Join Node to Way" -msgstr "" +msgstr "Priključi vozlišče k poti" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -809,30 +1037,40 @@ msgstr "Vključi izbrano vozlišče v najbližji del poti" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Priključi vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Vseeno združi" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Združi izbrano plast s plastjo pod njo." + +#: ../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:73 +#: ../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:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -840,68 +1078,79 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +msgstr "Vseeno združi" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Združi {0} vozlišč" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "izbor" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Pomakni izbranega člana vrstico nižje." + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgstr "Zrcali" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +msgstr "Prezrcali izbrana vozlišča in poti" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +msgstr "Prosim, izberize vsaj eno vozlišče ali pot." + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +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 #, java-format msgid "Move objects {0}" msgstr "Premakni predmete {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +msgstr "dol" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" -msgstr "" +msgstr "levo" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +msgstr "desno" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +msgstr "Premakni {0}" + +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Premakni predmete {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Predmetov ni možno prestaviti s tega sveta." @@ -909,5 +1158,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Nova" @@ -917,31 +1166,22 @@ msgstr "Ustvari nov zemljevid." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "neimenovano" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Odpri ..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Odpri datoteko." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Ni bilo možno prebrati \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 msgid "Open Location..." -msgstr "" +msgstr "Odpri mesto ..." #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -965,41 +1205,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 +msgid "Orthogonalize Shape" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 -msgid "Orthogonalize Shape" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +"projection to get rid of this warning.
Do you want to continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +msgstr "Izbrano je le eno vozlišče" + +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "" @@ -1013,13 +1253,13 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 msgid "Paste contents of paste buffer." -msgstr "" +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:78 +msgid "Paste Tags" +msgstr "Prilepi oznake" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1031,5 +1271,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 msgid "Open a preferences page for global settings." -msgstr "" +msgstr "Odpri stran z nastavitvami za splošne nastavitve." #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32 @@ -1047,16 +1287,21 @@ msgstr "Znova uveljavi zadnje razveljavljeno dejanje." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Preimenuj plast" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Hkrati preimenuj datoteko" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Preimenovanje datoteke \"{0}\" ni uspelo." @@ -1064,5 +1309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 msgid "Reverse Ways" -msgstr "" +msgstr "Obrni poti" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 @@ -1070,9 +1315,9 @@ msgstr "Obrni smer izbranih poti." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +msgstr "Izberite vsaj eno pot" + +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Obrni smer poti" @@ -1080,17 +1325,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Shrani" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Shrani trenutne podatke" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +msgstr "Datoteka {0} že obstaja. Jo prepišem?" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1098,25 +1345,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Dokument ni odprt, zato ni kaj shraniti." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Prazen dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +msgstr "Dokument ne vsebuje podatkov." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +msgstr "Vseeno shrani" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "V sporu z" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1124,54 +1371,75 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +msgstr "Zavrži spremembe in shrani" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Shrani datoteko OSM" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Shrani datoteko GPX" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" +msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Neznana končnica datoteke: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Neznana končnica datoteke." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" +msgstr "V vstavku {0} je prišlo do napake" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Shrani kot..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Shrani trenutne podatke v novo datoteko" +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Izberi vse" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1192,5 +1460,5 @@ #, java-format msgid "Help: {0}" -msgstr "" +msgstr "Pomoč: {0}" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99 @@ -1203,16 +1471,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Zapri" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +msgstr "Razdeli pot" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Razdeli pot pri izbranem vozlišču." @@ -1222,11 +1490,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +msgstr[0] "Izbrano vozlišče ni na sredini nobene poti." +msgstr[1] "Izbrani vozlišči nista na sredini nobene poti." +msgstr[2] "Izbrana vozlišča niso na sredini nobene poti." +msgstr[3] "Izbrana vozlišča niso na sredini nobene poti." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1235,44 +1505,50 @@ "There is more than one way using the nodes you selected. Please select the " "way also." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +msgstr[0] "Izbrano vozlišče je del več poti. Prosim, izberite tudi pot." +msgstr[1] "Izbrani vozlišči sta del več poti. Prosim, izberite tudi pot." +msgstr[2] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." +msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +msgstr "Izbrana vozlišča niso del iste poti." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča." +msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč." +msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč." +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 msgid "You must select two or more nodes to split a circular way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +msgstr "Za razdelitev krožne poti izberite dve ali več vozlišč." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " "middle of the way.)" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +"Poti se ne da razdeliti pri izbranih vozliščih. (Namig: Izberite vozlišča na " +"sredini poti.)" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +"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:356 msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"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:362 #, java-format msgid "Split way {0} into {1} parts" -msgstr "" +msgstr "Razdeli pot {0} na {1} delov" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1290,56 +1566,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +msgstr "Izberite bodisi:" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +msgstr "* Eno vozlišče z oznakami" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +msgstr "* Eno vozlišče, ki je del več poti, ali" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali" + +#: ../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:119 +msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti." + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1349,18 +1625,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" -msgstr "" +msgstr "Razmnoži v {0} vozlišč" #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" -msgstr "" +msgstr "Razmnoži {0} vozlišč v {1} vozlišč" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 @@ -1373,139 +1649,89 @@ msgstr "Izniči zadnje dejanje." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Počisti izbor" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Odizberi vse predmete" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Posodobitev podatkov" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Posodobitev trenutne podatkovne plasti (ponoven sprejem s strežnika)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +msgid "No current dataset found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +msgstr "Posodobi izbor" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +msgstr "Izbor je prazen" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Pošlji v OSM ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Pošlji vse spremembe na strežnik OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Novi predmeti:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Spremenjeni predmeti:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Izbrisani predmeti:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Pošljem te spremembe?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Ni česa poslati. Najprej pridobite kakšne podatke." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Ni sprememb za pošiljanje." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1519,17 +1745,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1540,54 +1766,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Pošlji vse spremembe na strežnik OSM." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, 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 "" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Novi predmeti:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Spremenjeni predmeti:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1675,42 +1912,54 @@ msgstr "Počasneje naprej" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Sprejem podatkov GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Surovi podatki GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Sprejem podatkov" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Nič podatkov ni bilo uvoženih." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "Podatki OpenStreetMap" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +msgstr "Sprejem {0} od {1} (še {2})" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Pošiljanje podatkov" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +msgstr "Napake pri sprejemu" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1722,27 +1971,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +msgstr "Način za brisanje" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Izbriši vozlišča ali poti" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format msgid "Mode: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +msgstr "Način: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1750,741 +1999,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Nariši" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Nariši vozlišča" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "izbrano" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "Dodaj vozlišče" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Dodaj vozlišče v pot" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "Dodaj novo vozlišče v pot" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -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:881 -msgid "Create new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Izrini" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Ustvari površine" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Izrini pot" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Za prenehanje vrtenja izpustite miškin gumb." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Povlecite segment poti za ustvarjenje pravokotnika." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Izberite" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Izberi, premakni ali zasuči predmete" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Za prenehanje premikanja izpustite miškin gumb. Ctrl za združitev z " -"najbližjo točko." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Povečava" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Povečava in premik zemljevida" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Išči..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Iskanje predmetov." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Ni naloženih podatkov." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Prosim, vnesite iskalni izraz." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "nadomesti izbor" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "dodaj v izbor" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "odstrani iz izbora" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "upoštevaj velikost črk" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "regularni izraz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Iskanje" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "Najdeno {0} zadetkov" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontaktiraj {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Sprejemanje..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Ni mogoče brati z naslova: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Napaka pri razločevanju na naslovu: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "predmetov" -msgstr[1] "predmet" -msgstr[2] "predmeta" -msgstr[3] "predmeti" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Izbriši {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Izbriši {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Premakni" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "vozlišč" -msgstr[1] "vozlišče" -msgstr[2] "vozlišči" -msgstr[3] "vozlišča" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Uveljavim?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relacija" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Stara vloga" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Nova vloga" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Star ključ" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Stara vrednost" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Nov ključ" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nova vrednost" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Uveljavi izbrane spremembe" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Ne uveljavi sprememb" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "Lastnosti " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Samodejno popravljanje oznak" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, 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:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Nastavitve shranjene na {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2496,7 +2027,783 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' ne sme biti ničen" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Nariši" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Nariši vozlišča" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "izbrano" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Dodaj vozlišče" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Dodaj vozlišče v pot" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Poveži obstoječo pot z vozliščem" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Ustvari novo vozlišče." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Izberi vozlišče pod kazalcem miške." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Vstavi novo vozlišče v {0} pot." +msgstr[1] "Vstavi novo vozlišče v {0} poti." +msgstr[2] "Vstavi novo vozlišče v {0} poti." +msgstr[3] "Vstavi novo vozlišče v {0} poti." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Nadaljuj pot od zadnjega vozlišča." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Zaključi risanje." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Izrini" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Ustvari površine" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Izrini pot" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Za prenehanje vrtenja izpustite miškin gumb." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Povlecite segment poti za ustvarjenje pravokotnika." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Izberite" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Izberi, premakni ali zasuči predmete" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Premakni elemente" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Premaknili ste več kot {0} elementov. Sočasen premik velikega števila " +"elementov je pogosto nenamerno.\n" +"Naj jih zares premaknem?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Premakni jih" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Razveljavi premik" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Za prenehanje premikanja izpustite miškin gumb. Ctrl za združitev z " +"najbližjo točko." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Povečava" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Povečava in premik zemljevida" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Išči..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Iskanje predmetov." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Prosim, vnesite iskalni izraz." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "nadomesti izbor" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "dodaj v izbor" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "odstrani iz izbora" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "upoštevaj velikost črk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "regularni izraz" + +#: ../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:95 +msgid "name:Bak - 'Bak' anywhere in the name." +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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +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 +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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Iskanje" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Začni iskanje" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "Najdeno {0} zadetkov" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Naloži izbrano" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontaktiraj {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "Sprejemanje..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "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 +#, 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 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "Dodaj {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Spremeni {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +msgstr "Odstrani \"{0}\" pri {1} ''{2}''" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "predmetov" +msgstr[1] "predmet" +msgstr[2] "predmeta" +msgstr[3] "predmeti" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "Odstrani \"{0}\" pri {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Nastavi {0}={1} pri {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "Spremeni vlogo člana relacije pri {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Razreši neskladja" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, java-format +msgid "Add conflict for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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 "" +"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:584 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Informacije" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Premakni" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "vozlišč" +msgstr[1] "vozlišče" +msgstr[2] "vozlišči" +msgstr[3] "vozlišča" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Zasuči {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Uveljavim?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relacija" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Stara vloga" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Nova vloga" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Star ključ" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Stara vrednost" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Nov ključ" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nova vrednost" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Uveljavi izbrane spremembe" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Ne uveljavi sprememb" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "Lastnosti " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Samodejno popravljanje oznak" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Nastavitve shranjene na {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2525,5 +2832,5 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2532,27 +2839,27 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "nepopoln" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Napaka: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Opozorilo: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +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:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2562,13 +2869,13 @@ msgstr[3] "poti" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +msgstr "poti" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2578,22 +2885,22 @@ msgstr[3] "relacije" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +msgstr "relacije" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +msgstr "paket sprememb" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +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:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2609,23 +2916,23 @@ msgstr[3] "{0} člani" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +msgstr "cesta" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vodotok" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +msgstr "raba tal" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2682,5 +2989,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "" @@ -2818,9 +3125,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr "" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2837,5 +3139,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "ozadje" @@ -2846,8 +3148,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2858,5 +3160,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "" @@ -2879,22 +3181,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Zaznamkov ni bilo mogoče prebrati." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Zaznamka ni bilo mogoče zapisati." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../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:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "neznan" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Nepričakovana napaka" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Ni se bilo mogoče povezati s strežnikom OSM. Preverite vašo povezavo z " +"internetom." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Neznan gostitelj" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Sporočilo dneva ni na voljo" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "" @@ -2969,62 +3377,57 @@ msgstr "Geslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +msgstr "uporaba" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +msgstr "možnosti" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +msgstr "Prikaži to pomoč" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Sprejmi pravokotno področje GPS podatkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Ponastavi nastavitve na privzete" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Nastavi jezik." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +msgstr "primeri" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3032,73 +3435,73 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktiviranje posodobljenih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +msgstr "Privzete nastavitve" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" -msgstr "" +msgstr "Meni: {0}" #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +msgstr "Celozaslonski način" + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +msgstr "Preklop celozaslonskega načina" + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Zvok" @@ -3106,5 +3509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84 msgid "Move right" -msgstr "" +msgstr "Premakni desno" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:84 @@ -3116,17 +3519,17 @@ #, java-format msgid "Map: {0}" -msgstr "" +msgstr "Zemljevid: {0}" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:89 msgid "Move left" -msgstr "" +msgstr "Premakni levo" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:94 msgid "Move up" -msgstr "" +msgstr "Premakni navzgor" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:99 msgid "Move down" -msgstr "" +msgstr "Premakni navzdol" #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:104 @@ -3142,53 +3545,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Geografska dolžina pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Ime predmeta pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Geografska širina pod kazalcem miške." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(ni predmeta)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "plasti ni na seznamu." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +msgstr "Napaka pri razčlenjevanju" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3210,6 +3628,7 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" -msgstr "" +msgstr "Pripravljanje" #. * @@ -3239,68 +3658,68 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +msgstr "Lastnosti" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +msgstr "Vozlišča" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3308,27 +3727,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" -msgstr "" +msgstr "Odpravljanje sporov" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325 @@ -3363,5 +3782,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3372,5 +3791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3384,5 +3803,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3442,22 +3861,21 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 msgid "Up" -msgstr "" +msgstr "Gor" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Premakni izbrani element za eno mesto višje" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 msgid "Down" -msgstr "" +msgstr "Dol" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "" +msgstr "Premakni izbrani element za eno mesto nižje" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3471,5 +3889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764 msgid "Freeze" -msgstr "" +msgstr "Zamrzni" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728 @@ -3480,5 +3898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760 msgid "Unfreeze" -msgstr "" +msgstr "Odmrzni" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761 @@ -3531,16 +3949,16 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" -msgstr "" +msgstr "parameter '{0}' ne sme biti ničen" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884 @@ -3560,5 +3978,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 msgid "Node" -msgstr "" +msgstr "Vozlišče" #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71 @@ -3567,10 +3985,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3579,19 +3997,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3600,9 +4018,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3612,13 +4030,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3626,90 +4044,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "izbrisano" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3719,5 +4137,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3742,12 +4160,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3792,10 +4209,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3804,10 +4221,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3816,5 +4233,5 @@ msgstr "Vrednost" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3874,9 +4291,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3884,5 +4301,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3912,42 +4329,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Vseeno shrani" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Razreši spore" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3965,96 +4399,129 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "" #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Plasti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "Odpri seznam vseh naloženih plasti." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "Izbriši izbrano plast." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Imate neshranjene spremembe. Vseeno izbrišem plast?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Ali res želite izbrisati celotno plast?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Informacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "da" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "S" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Izbriši" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Izbriši {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Prikaži/skrij" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Preklopi vidljivost izbrane plasti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Prikaži/skrij besedilo/ikone" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Plasti" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "Odpri seznam vseh naloženih plasti." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +msgid "Activate" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Izbriši izbrano plast." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Združi izbrano plast s plastjo pod njo." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "Pomakni izbrano plast vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Pomakni izbrano plast vrstico nižje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Združi izbrano plast s plastjo pod njo." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Plasti: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Informacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4065,22 +4532,28 @@ msgstr[3] "Spremenili boste do {0} predmete." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Prazna vrednost izbriše ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Sprememba vrednosti?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4091,84 +4564,89 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Izberite ključ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Izberite vrednost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Lastnosti/Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Lastnosti izbranih predmetov" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Spremeni relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Naj res izbrišem izbor iz relacije {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nov par ključ/vrednost vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Spremeni vrednost izbranega ključa vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Izbriši izbrani ključ vsem predmetom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Latnosti: {0} / Članstva: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Lastnosti / Članstva" @@ -4177,63 +4655,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacije" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Odpri seznam vseh relacij." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "Odpri urejevalnik za izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "Izbriši izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Trenutni izbor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Odpri okno s seznamom izbora" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Povečava na izbrane predmete" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Osveži seznam izbora." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Povečava na ves izbor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Izbor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4242,5 +4722,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4249,5 +4729,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4258,148 +4738,418 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Avtorji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Odpri seznam ljudi, ki delajo na izbranih predmetih." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Avtor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "Št. predmetov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -msgid "Apply Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Osnovno" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Član" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Sprejmi področje" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Naloži vidne ploščice" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Sprejem podatkov" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relacije" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Znova uveljavi zadnje razveljavljeno dejanje." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Dodaj izbrano" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Dodaj kot člane vse trenutno izbrane predmete" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Odstrani izbrano" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Pomakni izbranega člana vrstico nižje." + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Izbriši izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +msgid "No, continue editing" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Spor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Shrani trenutne podatke" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "V redu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 msgid "Download all incomplete ways and nodes in relation" msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +msgid "Confirm empty role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zmanjšaj" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Pomakni izbranega člana vrstico nižje." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Naloži izbrano" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4409,5 +5159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4417,25 +5167,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Zaznamki" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Prosim, vnesite želene koordinate." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Prosim, vnesite ime kraja." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "dodaj v izbor" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Najprej izberite zaznamek." @@ -4469,21 +5216,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Viri in vrste podatkov" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Sprejmi kot novo plast" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Sprejmi področje" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Področje za sprejem je preveliko; najbrž bo strežnik zahtevo zavrnil" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4491,13 +5238,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Prosim, vpišite iskani niz" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Rezultata iskanja kraja se ne da prebrati s strežnika" @@ -4505,5 +5252,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Vnesite ime kraja, ki ga želite poiskati:" @@ -4511,5 +5258,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4517,6 +5264,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "" @@ -4555,6 +5302,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4577,15 +5324,15 @@ msgstr "vrsta" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "blizu" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "povečava" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4594,5 +5341,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "" @@ -4624,5 +5371,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5364,5 +6117,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5529,59 +6282,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Točka {0} x {1} nima časovne oznake" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Ni moč najti slik z berljivo časovno oznako." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Berem {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Slike z geografskim položajem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "Začetek GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS sledi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "trenutna razlika: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "razlika časovnih pasov: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5591,138 +6344,128 @@ msgstr[3] "slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} znotraj sledi." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Uskladi uro" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "Slike JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V datoteki \"{0}\" manjka EXIF čas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Slika" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Uskladite čas z GPS napravo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Vpisanega časa ni bilo mogoče razpoznati." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "točka GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Riši povezave med točkami na tej plasti." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Ne riši povezav med točkami na tej plasti." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Prilagodi barvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "V redu" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Privzeto" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Izberite barvo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Uvozi zvok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Zvočne datoteke (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Uvozi slike" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5731,5 +6474,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5738,5 +6481,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5745,30 +6488,30 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Opis: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Pretvori v podatkovno plast" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5776,43 +6519,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5823,9 +6566,9 @@ "nadaljevati?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5833,5 +6576,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5839,47 +6582,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} izbrisan.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5906,5 +6649,5 @@ msgstr[3] "sledi" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -5914,5 +6657,5 @@ msgstr[3] "točke" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5923,5 +6666,5 @@ msgstr[3] "sled z {0} točkami" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5930,5 +6673,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5949,5 +6692,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5956,29 +6699,29 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5986,10 +6729,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Prikaži/skrij besedilo/ikone" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5997,5 +6747,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6003,29 +6753,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Napredne nastavitve" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6033,26 +6783,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Trenutna vrednost je privzeta" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Privzeta vrednost je ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Prosim izberite vrstico za urejanje." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6060,14 +6810,14 @@ msgstr "Nova vrednost za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Prosim izberite vrstico za izbris." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Vpišite nov par ključ/vrednost" @@ -6190,40 +6940,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Barva" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Izberite" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Izberite barvo za {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "Barve različnih predmetov v JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Barve" @@ -6553,46 +7303,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Nastavi razpoložljive vstavke." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Sprejmi seznam" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Posodobi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Nastavi vire vstavkov" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Nastavitve prikaza" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6600,29 +7358,29 @@ msgstr "Različne nastavitve, ki vplivajo na izgled celotne aplikacije." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Nastavitve povezave" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Nastavitve povezave do strežnika OSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Nastavitve zemljevida" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Nastavitve zvoka" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM." @@ -6723,59 +7481,61 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Izbriši izbrani vir iz seznama." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6941,33 +7701,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Uporabi prednastavitev ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6978,15 +7738,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -6998,18 +7758,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -7020,74 +7780,96 @@ msgstr "Skupina prednastavitev ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Sprejem točk od {0} do {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 +#. SAXException does not chain correctly +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +msgid "NullPointerException, possibly some missing tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 +msgid "Preparing data..." +msgstr "Pripravljam podatke..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Ni bilo možno prebrati \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 +msgid "GPX Files" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 +#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 +#, java-format +msgid "Markers from {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 +#, java-format +msgid "File \"{0}\" does not exist" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 +#, java-format +msgid "Parsing file \"{0}\" failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 +msgid "Parse error: invalid document structure for gpx document" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#, java-format +msgid "no primitive with id {0} in local dataset. Can't infer primitive type" +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 msgid "Downloading OSM data..." msgstr "Sprejemanje podatkov OSM..." -#. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 -msgid "NullPointerException, possibly some missing tags." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 -msgid "Preparing data..." -msgstr "Pripravljam podatke..." - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 -msgid "GPX Files" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../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 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 -#, java-format -msgid "Markers from {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 -#, java-format -msgid "File \"{0}\" does not exist" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 -#, java-format -msgid "Parsing file \"{0}\" failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309 -msgid "Parse error: invalid document structure for gpx document" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 -#, java-format -msgid "no primitive with id {0} in local dataset. Can't infer primitive type" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7095,48 +7877,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "" -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7145,15 +7926,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7161,23 +7942,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Pripravljanje..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Pošiljanje ..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Spremeni {0} {1}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7220,9 +8014,4 @@ msgid "Login" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Prekinjanje ..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7273,66 +8062,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Napaka med razčlenjevanjem." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Neznana različica" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "predmet z id=0 ni dovoljen" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7340,46 +8133,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Priprava podatkov OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Neveljaven id točke" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Vzpostavljanje povezave s strežnikom..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7388,5 +8201,18 @@ "internetom." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7395,16 +8221,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Posodobitev vstavkov" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7421,5 +8242,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7428,23 +8249,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7455,32 +8276,30 @@ msgstr "V vstavku {0} je prišlo do napake" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, 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 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Vstavka {0} ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Zadnja posodobitev vstavkov pred več kot {0} dnevi." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7490,21 +8309,21 @@ "možnosti 'pluginmanager.warntime' v nastavitvah.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Onemogoči vstavek" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7514,5 +8333,5 @@ "prepisati obstoječe datoteke." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7521,10 +8340,10 @@ "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Glede na podatke znotraj vstavka je avtor {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7532,9 +8351,9 @@ "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Naj vstavek onemogočim?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7544,27 +8363,23 @@ "njegovo odstranitev iz spomina." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih ste " -"dobili JOSM." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Informacije" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Informacij o vsavku ni bilo mogoče najti." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "opis ni na voljo" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7575,13 +8390,18 @@ msgstr[3] "Sprejeti podatki o vstavkih z {0} strežnikov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Informacij o vsavku ni bilo mogoče najti." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Vsi nameščeni vstavki so posodobljeni." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7594,9 +8414,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Sprejem manjkajočih vstavkov" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7609,57 +8429,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "neznan" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Različica {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Napaka pri branju datoteke s podatki o vstavkih: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Ne stori ničesar" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Prijavi napako" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7673,18 +8471,18 @@ "urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Nepričakovana napaka" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Prosimo, prijavite težavo na {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Napišite (čim bolj) točne korake kako ponoviti napako!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7693,17 +8491,33 @@ "Preden prijavite napako poskusite posodobiti JOSM na najnovejšo različico." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Prijava napake naj vsebuje vsaj naslednje informacije:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(besedilo je že bilo prekopirano na odložišče.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Ne prikaži več" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7713,5 +8527,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7719,5 +8533,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7726,13 +8540,28 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Namig: Bližnjice lahko urejate v nastavitvah.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7740,21 +8569,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7762,74 +8591,75 @@ msgstr "Pošiljanje sledi" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Javna" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Izbrana možnost javno objavi sled na openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Opis" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Izbrana GPS sled: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "Sled GPX je bila uspešno poslana" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Pošiljanje sledi GPX: {0}% ({1} od {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Ni obveznega opisa. Prosimo, vpišite opis sledi." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Ni izbrana plast GPX. Sledi ni mogoče poslati." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Pošiljanje sledi GPX" @@ -7895,33 +8725,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7941,15 +8772,15 @@ msgstr "Datoteke GPX (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Napaka pri razčlenjevanju {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7958,34 +8789,34 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7993,69 +8824,69 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Vse slike" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8064,9 +8895,9 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8075,65 +8906,65 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8141,13 +8972,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8169,5 +9000,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "" @@ -8190,6 +9021,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8353,22 +9184,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8376,18 +9207,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8500,6 +9331,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Prazna plast" @@ -8528,5 +9359,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8535,14 +9366,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8630,4 +9461,9 @@ msgstr "Neurejene poti ni mogoče podvojiti." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Ni naloženih podatkov." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8638,9 +9474,9 @@ msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8761,30 +9597,30 @@ msgstr "izbriši podatke po uvozu" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 +msgid "Importing data from device." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 -msgid "Importing data from device." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 msgid "Importing data from DG100..." msgstr "" +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 +msgid "Error deleting data." +msgstr "" + #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 -msgid "Error deleting data." -msgstr "" - -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 #, java-format msgid "imported data from {0}" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Povezava ni uspela." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8793,14 +9629,14 @@ msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Uvozi podatke iz Globalsat Datalogger DG100 naprave v plast GPX." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "" @@ -8891,40 +9727,40 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "" +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 +msgid "Lake Walker." +msgstr "" + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 -msgid "Lake Walker." -msgstr "" - -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "" @@ -8933,26 +9769,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "" -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "" @@ -9037,7 +9865,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "" @@ -9183,9 +10011,9 @@ msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "" @@ -9426,18 +10254,18 @@ msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Odpri vidne ..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Odpri le datoteke, ki so vidne v trenutnem pogledu." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9462,33 +10290,33 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "spremeni izbor" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9497,28 +10325,28 @@ msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -9782,4 +10610,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10026,33 +10875,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10084,6 +10933,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "" @@ -10093,10 +10942,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Mreža" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10183,23 +11032,15 @@ msgstr "Izvede preverbo veljavnosti podatkov" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Napake v podatkih. Vseeno pošljem?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Povečava na težavo" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Preveri" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Preveri pravilnost vseh podatkov ali samo izbora." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10270,22 +11111,22 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Podvojena vozlišča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "" @@ -10358,23 +11199,23 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Preverjanje lastnosti:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10383,7 +11224,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:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "" @@ -10391,78 +11232,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10470,82 +11313,82 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Viri podatkov" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Preveri vrednosti lastnosti." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Uporabi privzeto datoteko." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Uporabi privzeto datoteko (priporočeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Uporabi privzeto datoteko za črkovanje." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Popravi lastnosti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10690,7 +11533,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "zgradba" @@ -10704,5 +11547,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "" @@ -10736,10 +11579,10 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10793,7 +11636,31 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" msgstr "" @@ -10805,10 +11672,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10857,14 +11724,14 @@ msgstr "Pomoč vstavka WMS" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10875,26 +11742,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10902,5 +11769,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10910,5 +11777,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10917,107 +11784,107 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Samodejno sprejemanje" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" 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:337 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Nastavitve WMS vstavka" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Naziv v meniju" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "Povezava do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Vpišite ime za meni in povezavo do WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11122,11 +11989,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11136,10 +12008,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11147,5 +12019,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11155,5 +12027,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11163,15 +12035,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11179,5 +12051,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11185,5 +12057,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11192,15 +12064,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11209,10 +12081,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11221,15 +12093,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11239,10 +12111,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11251,5 +12123,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11258,5 +12130,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11264,11 +12136,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12423,58 +13302,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12488,6 +13315,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "" @@ -12513,6 +13340,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "hitra cesta" @@ -12538,6 +13365,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "glavna" @@ -12563,6 +13390,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "regionalna" @@ -12576,5 +13403,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "regionalna (turistična)" @@ -12592,5 +13419,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "" @@ -12624,6 +13451,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "" @@ -12650,6 +13477,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "" @@ -12699,5 +13526,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "krožišče" @@ -13676,5 +14503,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15405,27 +16232,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "šport" @@ -18264,7 +19091,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "" @@ -18334,7 +19161,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18360,5 +19187,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -18849,13 +19676,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -18897,5 +19724,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19115,4 +19942,65 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +msgid "motorroad" +msgstr "" + #. color tertiary #. @@ -19147,6 +20035,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19202,7 +20090,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19258,8 +20146,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19280,5 +20168,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19292,5 +20180,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19311,5 +20199,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19324,5 +20212,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19337,5 +20225,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19349,5 +20237,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19361,5 +20249,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19387,5 +20275,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19553,13 +20441,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19621,7 +20509,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19644,10 +20532,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19683,7 +20571,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19728,6 +20616,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19741,5 +20629,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19761,5 +20649,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19773,5 +20661,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19819,7 +20707,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19836,5 +20724,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19849,5 +20737,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19862,5 +20750,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19875,5 +20763,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19888,5 +20776,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19901,5 +20789,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20004,10 +20892,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20021,5 +20909,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -20033,5 +20921,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20159,12 +21047,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20178,5 +21066,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20248,8 +21136,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20351,10 +21239,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20740,22 +21628,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20787,6 +21675,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20847,8 +21735,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21201,26 +22089,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21292,8 +22180,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "" @@ -21443,9 +22331,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "" @@ -21517,8 +22405,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21589,8 +22477,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21604,5 +22492,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21616,5 +22504,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21636,5 +22524,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21648,5 +22536,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "" @@ -21660,5 +22548,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21681,5 +22569,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21693,5 +22581,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21705,5 +22593,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21717,5 +22605,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21729,5 +22617,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21784,7 +22672,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21798,5 +22686,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21809,5 +22697,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21822,5 +22710,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "" @@ -21834,5 +22722,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "" @@ -21887,8 +22775,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -21902,5 +22790,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21914,5 +22802,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -21926,5 +22814,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -21938,5 +22826,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -21950,5 +22838,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "" @@ -22026,8 +22914,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22075,7 +22963,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22217,10 +23105,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22268,6 +23156,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22564,18 +23452,37 @@ msgstr "" +#~ msgid "No data" +#~ msgstr "Ni podatkov" + +#~ msgid "Update failed" +#~ msgstr "Posodobitev ni uspela" + +#~ msgid "Layers: {0}" +#~ msgstr "Plasti: {0}" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih " +#~ "ste dobili JOSM." + +#~ msgid "Validate" +#~ msgstr "Preveri" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Preveri pravilnost vseh podatkov ali samo izbora." + #~ msgid "Data Layer" #~ msgstr "Podatkovna plast" -#~ msgid "Uploading data" -#~ msgstr "Pošiljanje podatkov" - -#~ msgid "Not implemented yet." -#~ msgstr "Še ni podprto." - -#~ msgid "Email" -#~ msgstr "E-pošta" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Razreši spore" +#~ msgid "their version:" +#~ msgstr "njihova različica:" + +#~ msgid "resolved version:" +#~ msgstr "končna različica:" + +#~ msgid "my version:" +#~ msgstr "moja različica:" #~ msgid "Object" @@ -22589,13 +23496,4 @@ #~ msgstr[3] "{0} objekti s konflikti:" -#~ msgid "my version:" -#~ msgstr "moja različica:" - -#~ msgid "their version:" -#~ msgstr "njihova različica:" - -#~ msgid "resolved version:" -#~ msgstr "končna različica:" - #~ msgid "Login name (email) to the OSM account." #~ msgstr "Uporabniško ime (email) vašega računa pri OSM." @@ -22604,6 +23502,6 @@ #~ msgstr "OSM uporabniško ime (email)" -#~ msgid "Unknown host" -#~ msgstr "Neznan gostitelj" +#~ msgid "Aborting..." +#~ msgstr "Prekinjanje ..." #~ msgid "position" @@ -22613,28 +23511,27 @@ #~ msgstr "različno" +#~ msgid "false" +#~ msgstr "napačno" + #~ msgid "true" #~ msgstr "pravilno" -#~ msgid "false" -#~ msgstr "napačno" +#~ msgid "Change" +#~ msgstr "Spremeni" + +#~ msgid "Not implemented yet." +#~ msgstr "Še ni podprto." + +#~ msgid "Email" +#~ msgstr "E-pošta" + +#~ msgid "unnamed" +#~ msgstr "neimenovano" #~ msgid "Resolve {0} conflicts in {1} objects" #~ msgstr "Razreši {0} sporov v {1} predmetih" -#~ msgid "Change" -#~ msgstr "Spremeni" - -#~ msgid "Rotate" -#~ msgstr "Zasuk" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Za premikanje in povečavo lahko uporabite miško ali +." - -#~ msgid "Tagging preset source" -#~ msgstr "Vir prednastavljenih oznak" - -#~ msgid "Tagging preset sources" -#~ msgstr "Viri prednastavljenih oznak" +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Prilagodi položaj plasti WMS" #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -22648,6 +23545,7 @@ #~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" -#~ msgid "image not loaded" -#~ msgstr "slika ni naložena" +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Za premikanje in povečavo lahko uporabite miško ali +." #~ msgid "" @@ -22658,6 +23556,22 @@ #~ "premik. Izbor: Kliknite z miško in povlecite" -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Prilagodi položaj plasti WMS" +#~ msgid "image not loaded" +#~ msgstr "slika ni naložena" + +#~ msgid "Rotate" +#~ msgstr "Zasuk" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno " +#~ "sprejeti." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Vstavek že obstaja" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" @@ -22666,10 +23580,4 @@ #~ msgid "Plugin requires JOSM update: {0}." #~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Vstavek že obstaja" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}" #~ msgid "" @@ -22683,10 +23591,24 @@ #~ "geslu." -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno " -#~ "sprejeti." +#~ msgid "Tagging preset source" +#~ msgstr "Vir prednastavljenih oznak" + +#~ msgid "Tagging preset sources" +#~ msgstr "Viri prednastavljenih oznak" + +#~ msgid "Add Selected" +#~ msgstr "Dodaj izbrano" + +#~ msgid "Remove Selected" +#~ msgstr "Odstrani izbrano" + +#~ msgid "Basic" +#~ msgstr "Osnovno" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Dodaj kot člane vse trenutno izbrane predmete" + +#~ msgid "Occupied By" +#~ msgstr "Član" #~ msgid "Edit Portcullis" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 16826) +++ /applications/editors/josm/i18n/po/sv.po (revision 16827) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 17:35+0000\n" -"Last-Translator: David S \n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-27 07:18+0000\n" +"Last-Translator: Konrad Skeri \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -16,82 +16,162 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Skapar huvudgränssnittet" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Osparade ändringar" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "Spara och avsluta" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "Kassera och avsluta" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -100,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "Avbryt" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Varning" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "OKÄND" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Om" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Visa om-skärmen" @@ -133,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -144,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -151,19 +291,19 @@ msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "Senast ändrad {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Javaversion {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Hemsida" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Buggrapporter" @@ -173,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Information" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Läsmig" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Utgåva" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Bidrag" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "Licens" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Insticksmoduler" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "Om JOSM..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Filen kunde inte hittas." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -214,16 +358,9 @@ "OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Varning" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -231,8 +368,38 @@ "primitives only" msgstr "" +"VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade " +"primitiven." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Välj vilken rad du vill ta bort." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Välj antingen:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Slå ihop noder" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Lägg till nod..." @@ -244,14 +411,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -259,57 +428,57 @@ msgstr "Redigera: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Ange den nya nodens koordinater." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Använd decimalgrader." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativa värden avser västra/södra halvklotet." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Latitud" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Longitud" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Bilda en cirkel av noderna" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Flytta de valda noderna in i en cirkel" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -325,25 +494,58 @@ msgstr "Verktyg: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "Välj åtminstone fyra noder." +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Placera noderna i en rak linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Flytta de valda noderna in i en linje" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "Välj åtminstone tre noder." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -354,18 +556,10 @@ "är {0}, max är {1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "Bryter mot API:ns möjligheter" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "Misslyckades att initialisera API. Vänligen försök igen senare." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "Misslyckades att initialisera API." - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -376,5 +570,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -385,46 +579,47 @@ "tillåtna längden ({2}). Värdets längd är {3}." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "lager" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "urval" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "nedhämtad data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "Zooma till {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Zooma det visade till {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -434,30 +629,30 @@ msgstr "Visa: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Det finns inte något valt att zooma till" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Välj åtminstone två sträckor att slå ihop" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Slå ihop sträckor med olika roller?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -466,13 +661,13 @@ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../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:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Ändra riktning?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -482,10 +677,10 @@ "några av dem?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "Byt riktning och slå ihop" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -493,20 +688,20 @@ msgstr "Ange värden för alla konflikter" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "Slå ihop {0} sträckor" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Alla sträckor var tomma" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -525,111 +720,149 @@ msgstr "Kopiera valda objekt till inklistringsbuffern." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Välj någonting att kopiera." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Skapa cirkel" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Skapa en cirkel av tre valda noder." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "De noderna är inte i en cirkel." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +"Välj antingen precis två eller tre noder, eller en sträcka som innehåller " +"precis två eller tre noder." + +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Ta bort" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Ta bort valda objekt." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Skriv över" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "Distribuera noder" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "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:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Hämta kartdata från OSM-servern." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Arkiv: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "Hämta" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Välj åtminstone en uppgift att hämta" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "{0} konflikter uppstod under import." + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "Fel under nedladdning" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Duplicera" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in." @@ -649,5 +882,5 @@ msgstr "Avsluta programmet." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -657,58 +890,73 @@ "licens." +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "Exportera till GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "Exportera data till en GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Det finns inte något att exportera. Skaffa lite data först." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "parametern ''{0}'' får inte vara null" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"." + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "beskrivning av gps-spår" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Lägg till information om upphovsman" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "Namn" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Fördefinierad" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyrightår" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Nyckelord" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Exportalternativ" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "Exportera och spara" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -719,25 +967,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Fel" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Välj en fördefinierad licens" @@ -747,46 +975,49 @@ msgstr "Onlinehjälp för JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Öppna i webbläsare" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Redigera" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Uppdatera" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Fel vid inläsning av sida{0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "Hjälpsida saknas. Skapa den på engelska." -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -804,14 +1035,14 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Visa historik om OSM vägar, noder eller relationer." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 msgid "Info about Element" -msgstr "" +msgstr "Information om element" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Visa objektinformation om OSM noder, vägar eller relationer." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -824,30 +1055,40 @@ msgstr "Anslut en nod till det närmaste avsnittet av en sträcka" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Förena nod och linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Inget kortkommando" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Slå ihop i alla fall" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Slå ihop det lager som finns precis under med det valda lagret." + +#: ../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:73 +#: ../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:148 +#: ../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:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -856,9 +1097,9 @@ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "Slå ihop i alla fall" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -866,60 +1107,71 @@ "behöva tas bort." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "Slå ihop {0} noder" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "urval" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Uppdatera markerade primitiv från servern" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +msgstr "Spegel" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "Spegla markerade noder och sträckor." -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "Markera minst en nod eller sträcka." -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "upp" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Flytta objekt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "ned" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "vänster" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "höger" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Flytta {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Flytta objekt {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Kan inte flytta objekt utanför världen." @@ -927,5 +1179,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Ny" @@ -935,26 +1187,17 @@ msgstr "Skapa ny karta" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "namnlös" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Öppna..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Öppna en fil." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Kunde inte öppna \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -983,34 +1226,35 @@ msgstr "Hämta URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Räta upp form" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Enbart två noder kan vara valda" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Urvalet måste bestå uteslutande av sträckor." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Välj sträckor som nästan har räta vinklar att räta upp." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "Du använder dig av projektionen EPSG:4326 vilket kan leda " @@ -1019,9 +1263,9 @@ "du fortsätta?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Enbart en nod vald" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Räta upp" @@ -1037,11 +1281,11 @@ msgstr "Klistra in innehållet i inklistringsbuffern" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Klistra in taggar" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1071,16 +1315,21 @@ msgstr "Gör om den senaste ogjorda handlingen." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Byt namn på lager" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Byt också namn på filen" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Kunde inte byta namn på filen \"{0}\"." @@ -1094,9 +1343,9 @@ msgstr "Ändra riktningen på alla valda sträckor." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Välj åtminstone en sträcka." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Ändra riktning på sträckor" @@ -1104,17 +1353,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Spara" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Spara nuvarande data." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "Fil {0} existerar redan. Skriv över?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1124,26 +1375,26 @@ "in detta som ett fel." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "" "Det finns inte något öppet dokument, så det finns inte något att spara." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Tomt dokument" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "Dokumentet innehåller inte någon data." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "Spara i alla fall" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Konflikter" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1153,54 +1404,75 @@ "som om du avvisat dem alla. Fortsätt?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "Avvisa konflikter och spara" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "Spara OSM-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "Spara GPX-fil" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "Spara Lager" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Kunde inte backa upp filen." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Okänt filformat: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Det uppstod ett fel när filen skulle sparas." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Det uppstod ett fel när backup-filen skulle återställas." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Okänd filändelse." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Det uppstod ett fel när filen skulle sparas." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Det uppstod ett fel när backup-filen skulle återställas." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Spara som..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Spara nuvarande data i en ny fil." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Välj allt" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1234,16 +1506,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "Stäng" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Dela sträcka" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Dela sträckan vid vald nod." @@ -1253,5 +1525,5 @@ msgstr "Det går inte att dela baserat på nuvarande urval." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." @@ -1259,5 +1531,5 @@ msgstr[1] "De valda noderna ligger inte inuti någon sträcka." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1273,9 +1545,9 @@ "sträckan." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "De valda noderna ingår inte i samma sträcka." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." @@ -1283,10 +1555,10 @@ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "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:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1296,19 +1568,23 @@ "sträckan.)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Ett rollbaserat relationsmedlemskap kopierades till alla nya sträckor.\n" "Du bör kontrollera detta och rätta till eventuella fel." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Medlemskap i relationer kopierades till alla nya vägar.\n" +"Du bör verifiera att detta är korrekt." + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1329,47 +1605,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Välj antingen:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* En nod med tagg, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* En nod som används av mer än en sträcka, eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "" "* 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:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1378,5 +1654,5 @@ "eller" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1385,5 +1661,5 @@ "sträcka." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1398,9 +1674,9 @@ "få sina egna kopior och alla noder kommer att vara valda." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "Frigjord nod" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1408,5 +1684,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1422,141 +1698,91 @@ msgstr "Ångra senaste åtgärden." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Avmarkera alla" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Avmarkera alla objekt." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Avmarkera allt (fokus)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Avmarkera allt (Escape)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "Uppdatera data" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" -"Ingen data som behövde uppdateras hittades. Har du redan öppnat eller laddat " -"ner ett datalager?" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "Inga data" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "Misslyckades med att uppdatera markerade primitiv." - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "Uppdatering misslyckades" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "Inget GPX-datalager kunde hittas." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +#, fuzzy +msgid "Didn't find a primitive with id {0} in the current dataset" msgstr "Kunde inte hitta primitiv med id {0} i nuvarande dataset" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "Primitiv saknas" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" msgstr "Uppdatera markering" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "Uppdatera markerade primitiv från servern" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "Det finns inga markerade primitiv att uppdatera." -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "Tom markering" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "Skicka in till OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Skicka in alla ändringar till OSM-servern." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Nya objekt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Ändrade objekt:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Borttagna objekt:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Skicka in dessa ändringar?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "Skicka in ändringar" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 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:164 +#: ../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:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Det finns inte några ändringar att skicka in." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "Ladda Upp" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "Uppdaterar primitiv" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synkronisera enbart {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "Synkronisera hela datasetet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1570,17 +1796,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "Konflikt upptäkt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "oförväntat returvärde. Erhöll {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1596,5 +1822,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1602,58 +1828,60 @@ "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" -"Uppladdning till servern misslyckades eftersom " -"dina
nuvarande data bryter mot ett förhandsvillkor.
Felmeddelandet " -"är:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" -"Uppladdning misslyckades eftersom en primitiv du " -"försökte
ta bort från servern redan är borttagen.

Felmeddelandet " -"är:
{0}" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "Primitiv redan raderad" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "Uppladdning misslyckades.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "Uppladningen till OSM API misslyckades" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "Uppdaterar primitiv" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Skicka in alla ändringar till OSM-servern." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"Kunde inte upprätta anslutning till OSM servern {0}.\n" -"Kontrollera din internetanslutning och att serverns URL är korrekt i dina " -"inställningar." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Nya objekt:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Ändrade objekt:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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/ZoomInAction.java:15 @@ -1741,42 +1969,54 @@ msgstr "Långsammare framåt" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "Hämtar GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "Hämtade GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Rå GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Hämtar data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "Ingen data importerad." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "Laddar ner {0} av {1} ({2} kvar)" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Skickar data" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "Följande fel inträffade under massnedladdning:" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "Fel under nedladdning" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1793,21 +2033,21 @@ "
Klicka på {2} för att ignorera.
" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "Raderade eller flyttade primitiv" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Borttagningsläge" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Ta bort noder eller sträckor" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1815,5 +2055,5 @@ msgstr "Läge: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1823,762 +2063,23 @@ "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Rita" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Rita noder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "markerad" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Lägg till nod" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Lägg till en nod till sträckan" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Knyt en existerande nod till en sträcka" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -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:504 -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:881 -msgid "Create new node." -msgstr "Skapa ny nod" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "Markera nod under pekare." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "Infoga ny nod i väg." -msgstr[1] "Infoga ny nod i {0} vägar." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -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:899 -msgid "Continue way from last node." -msgstr "Fortsätt väg från senaste nod." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "Avsluta ritning." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Dra ut" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Skapa ytor" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Dra ut sträcka" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Släpp musknappen för att välja objekten i rektangeln." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Släpp musknappen för att sluta rotera." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Dra en delsträcka för bilda en rektangel." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud " -"därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Markera" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Välj, flytta och rotera objekt." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "Lägg till och flytta en virtuell ny nod till väg." -msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "Flytta element" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Släpp musknappen för att sluta flytta. Ctrl för att slå ihop med närmaste " -"nod." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för att " -"växla läge); Skift+Ctrl för att rotera" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zooma:" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zooma och flytta kartan" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Zooma genom att dra eller Ctrl+. eller Ctrl+,; flytta med Ctrl+upp, vänster, " -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Sök..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Sök efter objekt." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Ingen data har lästs in." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Ange en söksträng." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "ersätt urval" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "utöka urval" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "ta bort från urval" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "gör skillnad på gemener/VERSALER" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "reguljärt uttryck" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"Baker Street - 'Baker' och 'Street' i vilken nyckel eller vilket " -"värde som helst." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"Baker Street\" - 'Baker Street' i vilken nyckel eller vilket värde " -"som helst." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -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:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -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:90 -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:91 -msgid "Special targets:" -msgstr "Särskilda mål:" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - elementets typ (node för nod, way för sträcka, " -"relation för relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -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:94 -msgid "id:... - object with given ID" -msgstr "id:... - objektet med angiven ID" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "nodes:... - objekt med givent antal noder" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "modified - alla ändrade objekt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "selected - alla valda objekt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "incomplete - alla ofullständiga objekt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "otaggade - alla otaggede objekt" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "Använd | eller OR för att kombinera med logiskt ELLER" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" -"Use \" för att sätta operatorer inom citattecken (t ex om nyckeln " -"innehåller :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "Använd ( och ) för att gruppera uttryck" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Sök" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "Påbörja sökning" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, 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:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} sökträffar" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"Det reguljära uttrycket \"{0}\" orsakade tolkningsfel vid offset {1}, " -"fullständigt fel:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "Det saknas argument för eller (or)." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "Det saknas argument för inte (not)." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "En avslutande parentes förväntades" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontakta {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "Hämtar..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Kunde inte läsa från URL:en: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Inläsningsfel på URL:en: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "Fel under kommunikation med servern." - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Ta bort \"{0}\" för {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Sätt {0}={1} för {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "objekt" -msgstr[1] "objekt" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Ta bort \"{0}\" för {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Sätt {0}={1} för {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Ta bort {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Ta bort {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "Relationskonflikt" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n" -"Ta bort från relationen?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "Ta bort från relation" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"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:359 -msgid "Split way segment" -msgstr "Dela delsträcka" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"Du håller på att ta bort noder utanför det område som du har hämtat hem.
" -"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske " -"använder dem.
Vill du verkligen ta bort dem?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Flytta" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "nod" -msgstr[1] "noder" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "Sekvens" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "Lös {0} taggninskonfliker i {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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}" -msgstr "Lös versionskonfliker för {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "Lös konflikter i nodlistan för väg {0}" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Tillämpa?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos " -"sträckan och dess noder ändras så att dataintegriteten inte komprometteras." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "Relation" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Gammal roll" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Ny roll" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Gammal nyckel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Gammalt värde" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Ny nyckel" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Nytt värde" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Verkställ valda ändringar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Verkställ inte ändringar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Egenskaper för " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Automatisk taggrättning" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "Fel i konfigurationsfilen på raderna {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Kan inte öppna inställningsmappen: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Inställningar lagrade på {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, 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:93 -msgid "Could not load preferences from server." -msgstr "Kunde inte hämta inställningar från server." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2590,7 +2091,804 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Rita" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Rita noder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "markerad" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Lägg till nod" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Lägg till en nod till sträckan" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Knyt en existerande nod till en sträcka" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +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:542 +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:928 +msgid "Create new node." +msgstr "Skapa ny nod" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "Markera nod under pekare." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "Infoga ny nod i väg." +msgstr[1] "Infoga ny nod i {0} vägar." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +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:947 +msgid "Continue way from last node." +msgstr "Fortsätt väg från senaste nod." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "Avsluta ritning." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Dra ut" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Skapa ytor" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Dra ut sträcka" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Släpp musknappen för att välja objekten i rektangeln." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Släpp musknappen för att sluta rotera." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Dra en delsträcka för bilda en rektangel." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Dra spelhuvudet och släpp i närheten av spår för att spela upp ljud " +"därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Markera" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Välj, flytta och rotera objekt." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "Lägg till och flytta en virtuell ny nod till väg." +msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "Flytta element" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" +"Du flyttade mer än {0} element. Flytt av ett stort antal element är ofta ett " +"fel.\n" +"Vill du verkligen flytta på dem?" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "Flytta" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "Ångra flytt" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Släpp musknappen för att sluta flytta. Ctrl för att slå ihop med närmaste " +"nod." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för att " +"växla läge); Skift+Ctrl för att rotera" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zooma:" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zooma och flytta kartan" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Zooma genom att dra eller Ctrl+. eller Ctrl+,; flytta med Ctrl+upp, vänster, " +"ned, höger; flytta karta med högerknappen" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Sök..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Sök efter objekt." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Ange en söksträng." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "ersätt urval" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "utöka urval" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "ta bort från urval" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "gör skillnad på gemener/VERSALER" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "reguljärt uttryck" + +#: ../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' och 'Street' i vilken nyckel eller vilket " +"värde som helst." + +#: ../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' i vilken nyckel eller vilket värde " +"som helst." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +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: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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +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 +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 +msgid "Special targets:" +msgstr "Särskilda mål:" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - elementets typ (node för nod, way för sträcka, " +"relation för relation)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +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: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 +msgid "modified - all changed objects" +msgstr "modified - alla ändrade objekt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "selected - alla valda objekt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "incomplete - alla ofullständiga objekt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "otaggade - alla otaggede objekt" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children 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 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" +"Use \" för att sätta operatorer inom citattecken (t ex om nyckeln " +"innehåller :)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +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/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Sök" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "Påbörja sökning" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, 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 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "{0} sökträffar" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"Det reguljära uttrycket \"{0}\" orsakade tolkningsfel vid offset {1}, " +"fullständigt fel:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "Det saknas argument för eller (or)." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "Det saknas argument för inte (not)." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "En avslutande parentes förväntades" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "Felaktigt antal parametrar för nodoperator." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Hämta urval" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontakta {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +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 +#, 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 +#, 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 +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}" +msgstr "Lägg till {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47 +#, java-format +msgid "Change {0} {1}" +msgstr "Ändra {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 +#, java-format +msgid "Remove \"{0}\" for {1} ''{2}''" +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}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "objekt" +msgstr[1] "objekt" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, 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 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Sätt {0}={1} för {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Jämka konflikt" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "Inga sökträffar för ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" +"Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är " +"närvarande" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +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?" +msgstr "" +"Urvalet \"{0}\" ingår i relationen \"{1}\"\n" +"Ta bort från relationen?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Dela delsträcka" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"Du håller på att ta bort noder utanför det område som du har hämtat hem.
" +"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske " +"använder dem.
Vill du verkligen ta bort dem?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Ta bort från relation" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Flytta" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "nod" +msgstr[1] "noder" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "raderar referens från relation {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 "Radera relationsmedlem {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, java-format +msgid "Rotate {0} {1}" +msgstr "Rotera {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "Sekvens" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "Lös {0} taggninskonfliker i {1} {2}" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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}" +msgstr "Lös versionskonfliker för {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "Lös konflikter i nodlistan för väg {0}" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Tillämpa?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos " +"sträckan och dess noder ändras så att dataintegriteten inte komprometteras." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "Relation" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Gammal roll" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Ny roll" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Gammal nyckel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Gammalt värde" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Ny nyckel" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Nytt värde" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Verkställ valda ändringar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Verkställ inte ändringar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Egenskaper för " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Automatisk taggrättning" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Inställningar lagrade på {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +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 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2619,34 +2917,34 @@ msgstr "Ö" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." -msgstr "" +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:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "ofullständig" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Fel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Varning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "noder" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" @@ -2654,13 +2952,13 @@ msgstr[1] "sträckor" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "vägar" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" @@ -2668,22 +2966,22 @@ msgstr[1] "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "relationer" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2697,23 +2995,23 @@ msgstr[1] "{0} medlemmar" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "landsväg" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "järnväg" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "vattendrag" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "markanvändning" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2742,5 +3040,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185 msgid "no latest version found. History is empty." -msgstr "" +msgstr "ingen senaste version funnen. Historiken är tom." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 @@ -2760,5 +3058,5 @@ #: ../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 "" +msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -2768,5 +3066,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "En sträcka för en yta är inte sluten." @@ -2904,9 +3202,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2923,5 +3216,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "bakgrund" @@ -2932,8 +3225,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2949,5 +3242,5 @@ "och börja på ett nytt lager i den nya zonen." -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambertzon (Frankrike)" @@ -2970,22 +3263,139 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Kunde inte läsa bokmärken." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Kunde inte skriva bokmärken." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Visa inte igen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"Kunde inte upprätta anslutning till OSM servern {0}.\n" +"Kontrollera din internetanslutning och att serverns URL är korrekt i dina " +"inställningar." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" +"Uppladdning till servern misslyckades eftersom " +"dina
nuvarande data bryter mot ett förhandsvillkor.
Felmeddelandet " +"är:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "Brott mot förhandsvillkor" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "okänd" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Oväntat undantag" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"Kunde inte upprätta anslutning till OSM servern {0}.\n" +"Kontrollera din internetanslutning och att serverns URL är korrekt i dina " +"inställningar." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Okänd värddator" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" +"Uppladdning misslyckades eftersom en primitiv du " +"försökte
ta bort från servern redan är borttagen.

Felmeddelandet " +"är:
{0}" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +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 msgid "Message of the day not available" msgstr "Dagens meddelande är inte tillgängligt" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- nuvarande version är {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "Hämtar \"Dagens meddelande\"" @@ -3066,63 +3476,57 @@ msgstr "Lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" -"Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}." - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standard unix-geometri-argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Öppna fil (som rå gps, om .gpx)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Hämta området innanför gränsvärden som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "Öppna i maximerat läge" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Återställ inställningarna till förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Ange språk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "exempel" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3132,51 +3536,51 @@ "data innan --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "Istället för --download= kan du använda osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Aktiverar uppdaterade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3184,21 +3588,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Växla trådnätsvisning" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "Fullskärm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "Växla mellan fullskärmsläge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Ljud" @@ -3242,53 +3646,68 @@ msgstr "skala" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Den geografiska longituden vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Namnet på objektet vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Den geografiska latituden vid muspekaren." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Vinkeln mellan föregående och pågående delsträcka." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Kompassriktning för den delsträcka som ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Längden hos den nya delsträcka som håller på att ritas." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(inget objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "lagret finns inte i listan." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "Ansluter till OSM-servern" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Fel vid tolkning" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3310,4 +3729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Initierar" @@ -3339,20 +3759,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "Taggar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3360,47 +3780,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3408,25 +3828,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3463,5 +3883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3472,5 +3892,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3484,5 +3904,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3557,7 +3977,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3631,14 +4050,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3667,10 +4086,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3679,19 +4098,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "Ja, återskapa dem också" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "Nej, avbryt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3702,9 +4121,9 @@ "raderade på servern.

Vill du återskapa dessa noder också?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "Återskapa ytterligare noder?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3714,13 +4133,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3728,90 +4147,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "raderad" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3821,5 +4240,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3844,12 +4263,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3894,10 +4312,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3906,10 +4324,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3918,5 +4336,5 @@ msgstr "Värde" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3976,9 +4394,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3986,5 +4404,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -4015,42 +4433,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Fortsätt ändå" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Lös versionskonfliker för {0} {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -4068,96 +4503,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Lager" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Ta bort valt lager." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Det finns osparade ändringar. Skall lagret tas bort i alla fall?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "Ta bort lager" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Vill du verkligen ta bort hela lagret?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Information" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "ja" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "N" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Ta bort" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Ta bort {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Visa/Dölj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Alternera visning av det valda lagret." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Visa/Dölj text/ikoner" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Växla visning av markörtext och ikoner." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Lager" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "privat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Ta bort valt lager." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Slå ihop det lager som finns precis under med det valda lagret." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "Flytta det valda lagret en rad ner." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Slå ihop det lager som finns precis under med det valda lagret." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Lager: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Mer information om denna funktion" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4166,22 +4635,28 @@ msgstr[1] "Detta kommer att ändra upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Om värdet är tomt tas nyckeln bort." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Ändra värden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4190,84 +4665,89 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Välj en nyckel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Välj ett värde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Välj de objekt vars egenskaper du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Egenskaper/Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Egenskaper för valda objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "Ändra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Verkligen ta bort det valda från relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Lägg till egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Lägg till" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Redigera egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Redigera värdet av den valda nyckeln för alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Ta bort egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Ta bort den valda nyckeln från alla objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Egenskaper / Roller" @@ -4276,63 +4756,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "Öppna en lista över alla relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Skapa en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "Relationer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Ta bort den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Aktuellt urval" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Öppna en urvalslista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Zooma till valda objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Uppdatera urvalslistan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Zooma till urval" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4341,5 +4823,5 @@ msgstr[1] "{0} sträckor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4348,5 +4830,5 @@ msgstr[1] "{0} relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4357,5 +4839,10 @@ msgstr "Lossa panelen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -4364,143 +4851,411 @@ "vänstra verktygraden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "Klicka för att minimera/maximera panelens innehåll" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Upphovsmän" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Öppna en lista över de som arbetar med de valda objekten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "Upphovsman" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Upphovsmän: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Hämta område" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Hämta de rutor som syns" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "Datakonflikter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Hämtar {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "Relationer" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Tog bort element från relation" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +#, fuzzy +msgid "Remove all members referring to one of the selected primitives" +msgstr "Misslyckades med att uppdatera markerade primitiv." + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "Flytta vald medlem/valda medlemmar uppåt" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "Flytta vald medlem/valda medlemmar nedåt" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Ta bort alla för närvarande valda objekt från relationen" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Ta bort den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Inte ansluten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "Datakonflikter" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Spara nuvarande data." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Hämta alla ofullständiga sträckor och noder i relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "Hämta medlemmar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "Bekräfta fjärrstyrd handling" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zooma ut" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Flytta vald medlem/valda medlemmar nedåt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "Verkställ ändringar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "Grundläggande" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Innehas av" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "Flytta uppåt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "Flytta vald medlem/valda medlemmar uppåt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Lägg till vald" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Lägg till alla för närvarande valda objekt som medlemmar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "Ta bort det valda" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "Ta bort alla för närvarande valda objekt från relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "Flytta nedåt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "Flytta vald medlem/valda medlemmar nedåt" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "Hämta medlemmar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "Relationsredigerare:{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Hämta urval" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4510,5 +5265,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4518,25 +5273,22 @@ msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "Uppdatera egenskaper för upp till {0} objekt" -msgstr[1] "Uppdatera egenskaper för upp till {0} objekt" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Bokmärken" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "Ange först önskade koordinater." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Ange platsens namn." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "Byt plats" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "Välj ett bokmärke först." @@ -4571,21 +5323,21 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Datakällor och -typer" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Hämta som ett nytt lager" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Hämta område" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern." -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "" @@ -4593,13 +5345,13 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Ange en söksträng" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Kan inte läsa sökresultat för plats från servern" @@ -4607,5 +5359,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Ange ett platsnamn att söka efter:" @@ -4613,5 +5365,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4619,6 +5371,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "namn" @@ -4657,6 +5409,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4679,15 +5431,15 @@ msgstr "typ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "nära" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "zooma" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4696,5 +5448,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Glidande karta" @@ -4726,5 +5478,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5466,5 +6224,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5631,59 +6389,59 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "Bilder för {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "Läs in GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Tid saknas för punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Inga bilder med läsbara tidsangivelser hittades." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "Läser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotaggade bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS startpunkt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS slutpunkt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "nuvarande delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "tidsskillnad: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" @@ -5691,138 +6449,128 @@ msgstr[1] "bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} inom spåret." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Synka klocka" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG-bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datum i fil \"{0}\" kunde inte tolkas." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "Tidszon för GPS-enhet (skillnad mot foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisera Tid med GPS-enheten" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Angiven tid kunde inte tolkas." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps-punkt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Anpassa linjeritning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Använd globala inställningar" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Rita linjer mellan punkter i detta lager." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Rita inte linjer mellan punkter i detta lager." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Välj alternativ för linjeritning" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Anpassa färger" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Välj en färg" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "Markörer från namngivna punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "Namngivna spårpunkter från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Importera ljud" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave-ljudfiler (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "Ljudmarkörer från {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Importera bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5831,5 +6579,5 @@ msgstr[1] "{0} spår, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5838,5 +6586,5 @@ msgstr[1] "{0} rutter, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5845,30 +6593,30 @@ msgstr[1] "{0} sträckpunkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "Namn: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Beskrivning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Tidsomfång: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Längd: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Omvandla till datalager" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5878,43 +6626,43 @@ "skicka in spår, se här:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Omvandlad från:{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "Hämta från OSM längs med detta spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Hämta allting inom:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} meter" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5925,9 +6673,9 @@ "Önskar du
fortsätta?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5937,5 +6685,5 @@ "än dess slut uteslöts eller flyttades till början." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5945,47 +6693,47 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} raderad.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -6010,5 +6758,5 @@ msgstr[1] "spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" @@ -6016,5 +6764,5 @@ msgstr[1] "punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -6023,5 +6771,5 @@ msgstr[1] "ett spår med {0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -6030,5 +6778,5 @@ msgstr[1] "{0} består av {1} spår" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -6047,5 +6795,5 @@ msgstr[1] "markörer" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -6054,29 +6802,29 @@ msgstr[1] "{0} består av {1} markörer" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Synkronisera ljud" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Du behöver pausa ljudet precis när du hör synkroniseringsindikatorn." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Ljud synkroniserat vid punkt {0}." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Det går inte att synkronisera i det lager som spelas upp." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Skapa ljudmarkör vid spelhuvud" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -6086,10 +6834,17 @@ "markören." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Visa/Dölj text/ikoner" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Växla visning av markörtext och ikoner." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -6097,5 +6852,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6105,29 +6860,29 @@ "spårpunkt där du vill synkronisera." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Kunde inte skapa ny ljudmarkör." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Fel uppstod vid visning av URL:en för denna markör." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL:en var: " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Fel vid visning av URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "Avancerade inställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Ange inställningar direkt. Använd med försiktighet!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6135,27 +6890,27 @@ msgstr "Sök: " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Nuvarande värde är förval." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Nuvarande värde är ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "" "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:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Välj vilken rad du vill ändra." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6163,14 +6918,14 @@ msgstr "Nytt värde för {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Välj vilken rad du vill ta bort." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Ange ett nytt nyckel/värde-par" @@ -6306,40 +7061,40 @@ msgstr "Kalibrering av röstinspelare" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Färg" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Ritstil{0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "Lager: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Välj" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "Välj en färg för {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "Sätt till förval" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "Sätt allt till förval" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "De färger som används av olika objekt i JOSM." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Färger" @@ -6680,46 +7435,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Ställ in tillgängliga insticksmoduler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "Hämta lista" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Uppdatera" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Konfigurera hämtställen..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Välj en post." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Konfigurera hämtställen för insticksmoduler" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Visningsinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6728,29 +7491,29 @@ "Olika inställningar som påverkar hur hela programmet representeras visuellt." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Anslutningsinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "Anslutningsinställningar för OSM-servern" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Kartinställningar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Inställningar för kartprojektion och datatolkning." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Ljudinstä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 audio player and audio markers." msgstr "Inställnignar för ljudspelare och ljudmarkörer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "" @@ -6853,59 +7616,61 @@ msgstr "Kortkommando" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Välj vilken rad du vill kopiera." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Ta bort vald källa från listan." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -7099,33 +7864,33 @@ msgstr "Modifierargrupper" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "Mer information om denna funktion" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "Använd snabbval ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "slutenväg" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -7136,15 +7901,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekt av typ {0} stöds." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7154,18 +7919,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -7176,33 +7941,36 @@ msgstr "Snabbvalsgrupp ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "Ansluter till OSM-servern..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "Hämtar punkter {0} till {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "Hämtar OSM-data..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "NullPointerException, Det saknas förmodligen några taggar." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Förbereder data..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Kunde inte öppna \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7210,21 +7978,21 @@ msgstr "GPX-filer" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "Markörer från {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7240,10 +8008,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7251,48 +8038,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183-filer" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "Koordinater importerade: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Felaktigt utformade meningar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Checksum-fel: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Okända meningar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Nollkoordinater: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "Import från NMEA genomförd" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "Import från NMEA misslyckades!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7301,15 +8087,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7317,23 +8103,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Öppnar ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Förbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Skickar in..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Läser igenom folder {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7376,9 +8175,4 @@ msgid "Login" msgstr "Logga in" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "Avbryter..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7429,66 +8223,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Fel vid tolkning." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Okänd version" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "Hittade element av typen på icke-sträcka" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " har nollreferens" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "Fann -tagg utanför relation." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Ofullständig -specifikation med ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Ogiltigt objekt med id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7496,47 +8294,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Det nödvändiga attributet \"{0}\" saknas." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" -"Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "Förbereder OSM-data..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Felformaterad nod-id" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Tar kontakt med servern..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7544,5 +8361,18 @@ "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2}), {3} 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 #, java-format msgid "" @@ -7551,16 +8381,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Uppdatera insticksmoduler" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "Hämta insticksprogram" @@ -7578,5 +8403,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7585,23 +8410,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7612,19 +8437,17 @@ msgstr "Fel uppstod i insticksmodulen {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "" "Varning - insticksmodulen {0} har begärts. Denna insticksmodul behövs inte " "längre." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." @@ -7633,15 +8456,15 @@ "inte hittas." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Insticksmodulen kunde ej hittas: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7651,12 +8474,12 @@ "med hjälp av inställningen 'pluginmanager.warntime'.)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Avaktivera insticksmodul" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" @@ -7665,9 +8488,9 @@ "inställningarna?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "Behåll plugin" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7677,5 +8500,5 @@ "JOSM har behörighet att skriva över de existerande." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7684,10 +8507,10 @@ "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7696,9 +8519,9 @@ "innan du rapporterar en bugg." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Skall insticksmodulen avaktiveras?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7708,27 +8531,23 @@ "frigöra insticksmodulen." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "" -"Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick " -"JOSM från." - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Information" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Kunde inte hitta någon information om insticksmoduler." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "ingen beskrivning tillgänglig" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7737,13 +8556,18 @@ msgstr[1] "Hämtade information om insticksmoduler från {0} ställen" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Kunde inte hitta någon information om insticksmoduler." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Alla installerade insticksmoduler är av senaste version." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7756,9 +8580,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Hämta saknade insticksmoduler" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7771,57 +8595,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "okänd" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Version {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Insticksmodul som medföljer JOSM" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Fel vid inläsning av informationsfil för insticksmodul: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Detta är slutet av inspelningen" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Fel vid uppspelning av ljud" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Gör ingenting" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "Rapportera en bugg" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7835,14 +8637,14 @@ "lämna in en felrapport." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Oväntat undantag" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Lämna in en rapport på {0}" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "" @@ -7850,5 +8652,5 @@ "möjligt)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7858,17 +8660,34 @@ "versionen av JOSM och alla insticksmoduler." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Följande information måste finnas med:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Texten finns redan i urklipp.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Visa inte igen" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" +"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 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7882,5 +8701,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7890,5 +8709,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7899,13 +8718,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(Tips: Du kan själv välja kortkommandon i inställningarna.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "Skapa ett nätverk av sträckor" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7913,21 +8747,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "Välj två sträckor som delar en nod." -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "Skapa ett rutnät av sträckor" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "Skicka in spår" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7935,74 +8769,75 @@ msgstr "Skicka in spår" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "Publik" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "Beskrivning" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "Ange beskrivning för ditt spår." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "Valt spår: {0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Ansluter..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "Inskickning avbruten" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "Fel vid inskickning" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX-inskickning genomförd" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "Inskickning misslyckades. Servern returnerade följande meddelande: " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "Skickar in GPX-spår: {0}% ({1} av {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "Ingen beskrivning angiven. Skriv in en beskrivning." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "Inget GPX-lager valt. Kan inte skicka in ett spår." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "Inget användarnamn angivet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "Inget lösenord angviet." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "Skickar in GPX-spår" @@ -8072,33 +8907,34 @@ msgstr "En av de valda filerna var null !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Läs in foton..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Läser igenom folder {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Fel vid läsning av filer från folder {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "Korrelerar med GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -8118,15 +8954,15 @@ msgstr "GPX-filer" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\"" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Fel vid tolkning {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -8138,34 +8974,34 @@ "välj en tidzon
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Fototid (från exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps-tid (läst från fotot ovan): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Jag är i följande tidzon: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Inget datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Öppna ett annat foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8175,29 +9011,29 @@ "Använd begärt format" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Ogiltigt datum" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX-spår: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Öppna ett annat foto" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Tidszon: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Förskjutning:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "" @@ -8205,41 +9041,41 @@ "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Uppdatera position för: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Alla bilder" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "Bilder utan positionsangivelse i exif" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "Bilder som inte taggats ännu" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "Sätt bilder i relation till GPX-spår" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "Korrelera" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "Auto-gissa" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "Välj ett GPX-spår" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "Inget GPX-spår har valts" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8250,9 +9086,9 @@ "Förväntat format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Ogiltig tidszon" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8263,26 +9099,26 @@ "Förväntat format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Ogiltig förskjutning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "Hittade {0} träffar för {1} i GPX-spår {2}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX-spår har hämtats" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "De markerade fotografierna innehåller ingen tidsinformation." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "Fotografierna innehåller ingen tidsinformation." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." @@ -8290,39 +9126,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:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX-spåret saknar tidsinformation" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "Tidszon: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "Minuter: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "Sekunder: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "Parade ihop {0} av {1} foton med GPX-spåret" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "(Tidsdifferens om {0} dagar)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "Förskjutning mellan spår och foton: {0}m {1}s" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8330,13 +9166,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "Matchning av fotografier mot spår misslyckades" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "Justera tidszon och tidsförskjutning" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "Standardinställningar" @@ -8358,5 +9194,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Fel vid läsning av fil" @@ -8379,6 +9215,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: Ogiltig URL." @@ -8550,22 +9386,22 @@ msgstr "Lägg \"source=...\" till objekt?" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "Hämtar {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "Kontaktar WMS-servern..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "Skapa byggnader" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8573,18 +9409,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "Extrahera den gräns som passar bäst..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "Skapa gräns" @@ -8697,6 +9533,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Tomt lager" @@ -8725,5 +9561,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8734,14 +9570,14 @@ "Skapa en ny." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "Cacheformatsfel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "" @@ -8829,4 +9665,9 @@ msgstr "Skapa en dubblett av sträcka" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Ingen data har lästs in." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8837,9 +9678,9 @@ msgstr "Skapa en dubblett av sträcka" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "Lager för editering av GPX-spår" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "Konvertera till GPX-lager med anonymiserad tid" @@ -8960,30 +9801,30 @@ msgstr "ta bort data efter import" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Importerar data från enhet." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "Importerar data från DG100..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Fel vid borttagning av data" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "importerade data från {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Ingen data återfanns på enheten." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Anslutning misslyckades." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8995,14 +9836,14 @@ "josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsatimport" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Importera data från en Globalsat Datalogger DG100 in i ett GPX-lager" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "Importera" @@ -9093,40 +9934,40 @@ msgstr "Öppna bilder med ImageWayPoint" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Riktningsindex '{0}' kunde inte hittas" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Startpositionen låg inte inom gränsvärdena (bbox)" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Letar efter strandlinje..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "Hittills {0} noder..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lakewalker." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Fel uppstod när cache-biblioteket skulle skapas: {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "Spårar" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "kontrollerar cache..." @@ -9135,26 +9976,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "Genomför hörnreduktion..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Utför Douglas-Peucker-approximation..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Tar bort dubblettnoder..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Spår från lakewalker" @@ -9239,7 +10072,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "vatten" @@ -9395,9 +10228,9 @@ msgstr "Inställningar för insticksmodulen Lakewalker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Hämtar bildruta..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Kunde inte skaffa en bild" @@ -9643,18 +10476,18 @@ msgstr "Okänd status för problemfall" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Öppna det som syns..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Öppna enbart filer som är synliga i nuvarande visningsläge." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Ingenting visas - kan inte fastställa gränser!" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9681,33 +10514,33 @@ msgstr "Firefox-applikationen" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "hämta data från API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "ändra urval" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "ändra vad som visas" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "bekräfta alla fjärrstyrda handlingar manuellt" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Fjärrstyrning" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Inställningar för insticksmodulen Fjärrstyrning" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9719,28 +10552,28 @@ "applikationer i kommunikation med insticksmodulen." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Tillåtna handlingar" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "Fjärrstyrning har begärts för att hämta data från API" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "Detaljer om begäran: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Vill du tillåta detta?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "Bekräfta fjärrstyrd handling" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Fjärrstyrning har begärts för att importera data från följande URL:" @@ -10006,4 +10839,25 @@ msgstr "Färgmarkera" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "Uppdatera egenskaper för upp till {0} objekt" +msgstr[1] "Uppdatera egenskaper för upp till {0} objekt" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10261,34 +11115,34 @@ msgstr "Öppnar en dialogruta som gör att man kan gå direkt till en viss plats" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 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:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 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:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "Zoomnivå (meter)" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "Gå direkt dit" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "Gå direkt till plats" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" "Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena." -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "Kunde inte tolka lon/lat" @@ -10323,6 +11177,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Valideringsfel" @@ -10332,10 +11186,10 @@ msgstr "Inga valideringsfel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Rutnät" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10426,23 +11280,15 @@ msgstr "Utför datavalidering" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Data med fel. Skicka in ändå?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Öppna valideringslistan" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Zooma till problem" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Validera" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Validera antingen nuvarande urval eller hela datasetet." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10515,23 +11361,23 @@ msgstr "Korsande sträckor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Dubbletter av noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "Dubbletter av noder på sträckor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Letar efter sträckor med identiska noder i följd." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Dubbletter av noder på sträckor" @@ -10610,23 +11456,23 @@ "felstavning." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Egenskapskontrollerare:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Ogiltig taggkontrollsrad - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Ogiltig rättstavningsrad: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10637,7 +11483,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Ogiltig kombination av nyckel och värde" @@ -10645,78 +11491,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Ritningsproblem" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Nyckeln ''{0}'' är ogiltig." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Taggar med tomma värden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Ogiltig egenskapsnyckel" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Egenskapsvärdet börjar eller slutar med blanksteg" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Det finns en HTML-markör i egenskapsvärdet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXME-taggar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Kontrollera egenskapsnycklar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "Validera egenskapsnycklar genom att kontrollera mot en lista av ord." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Använd komplicerad egenskapskontroll." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Källa för TagChecker" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10727,84 +11575,84 @@ "taggkontrollera datafiler." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "Lägg till en ny källa till listan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Redigera vald källa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Datakällor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Kontrollera egenskapsvärden" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "" "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Leta efter FIXME-taggar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" "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:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Kontrollera om det finns ritningsanmärkningar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Kontrollera om problem uppstod vid ritning av kartan" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "Använd förvald datafil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Använd den förvalda datafilen (rekommenderas)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Använd förvalda rättstavningsfil." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Rätta till egenskaper" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Kunde inte hitta elementtyp" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Kunde inte hitta varningsnivå" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Ogiltigt uttryck ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10949,7 +11797,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "byggnad (building)" @@ -10963,5 +11811,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "yta (area)" @@ -10997,10 +11845,10 @@ msgstr "Slutnod på sträcka nära annan sträcka" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Noder som saknar tagg och inte ingår i en sträcka" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -11060,8 +11908,32 @@ msgstr "Felriktat land: land inte på vänster sida" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -11072,10 +11944,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -11124,14 +11996,14 @@ msgstr "Hjälp om WMS-insticksmodulen" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Korrigerad bild..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -11142,26 +12014,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -11169,5 +12041,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -11177,5 +12049,5 @@ msgstr "Justera valt WMS-lagers läge" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -11184,108 +12056,108 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Automatisk hämtning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS-lager ({0}), hämtas i zoomläge {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" 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:231 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 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:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" 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:337 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "Inställningar för WMS-insticksmodulen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "" "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menynamn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Menynamn (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS-url (Förval)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Ange ett menynamn och en URL för WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Kopiera förval" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11394,11 +12266,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11408,10 +12285,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11419,5 +12296,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11427,5 +12304,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11435,15 +12312,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11451,5 +12328,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11457,5 +12334,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11464,15 +12341,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11481,10 +12358,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11493,15 +12370,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11511,10 +12388,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11523,5 +12400,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11530,5 +12407,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11536,11 +12413,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12695,58 +13579,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12760,6 +13592,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "motorväg" @@ -12785,6 +13617,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "stamväg" @@ -12810,6 +13642,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "primärväg" @@ -12835,6 +13667,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "sekundärväg" @@ -12848,5 +13680,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "tertiärväg" @@ -12864,5 +13696,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "bostadsgata" @@ -12896,6 +13728,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "tillfartsväg" @@ -12922,6 +13754,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "under byggnad" @@ -12971,5 +13803,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "rondell" @@ -13948,5 +14780,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "kärr" @@ -15677,27 +16509,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "sport" @@ -16698,5 +17530,5 @@ #: build/trans_presets.java:2900 msgid "lutheran" -msgstr "luteraner" +msgstr "luteraner (inkl. Svenska kyrkan)" #: build/trans_presets.java:2170 build/trans_presets.java:2891 @@ -18536,7 +19368,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "cykel" @@ -18606,7 +19438,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "fot" @@ -18632,5 +19464,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "tunnelbana" @@ -19121,13 +19953,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "förlegad" @@ -19169,5 +20001,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "häst" @@ -19387,4 +20219,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "motorsport" + #. color tertiary #. @@ -19419,6 +20313,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "gata" @@ -19474,7 +20368,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "landsvägsspår" @@ -19530,8 +20424,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "räls" @@ -19552,5 +20446,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19564,5 +20458,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19583,5 +20477,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "vändplats" @@ -19596,5 +20490,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19609,5 +20503,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "flodbank" @@ -19621,5 +20515,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "bäck" @@ -19633,5 +20527,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "hamn" @@ -19659,5 +20553,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "akvedukt" @@ -19825,13 +20719,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "byggnadsverk" @@ -19893,7 +20787,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "järnvägspunkt" @@ -19916,10 +20810,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19955,7 +20849,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -20000,6 +20894,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -20013,5 +20907,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -20033,5 +20927,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -20045,5 +20939,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -20091,7 +20985,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "linbana" @@ -20108,5 +21002,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -20121,5 +21015,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -20134,5 +21028,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -20147,5 +21041,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -20160,5 +21054,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -20173,5 +21067,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20276,10 +21170,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "kraft" @@ -20293,5 +21187,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "pir" @@ -20305,5 +21199,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "rörledning" @@ -20431,12 +21325,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "fritid" @@ -20450,5 +21344,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "marina" @@ -20520,8 +21414,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "inrättning" @@ -20623,10 +21517,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "trafikinrättning" @@ -21012,22 +21906,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -21059,6 +21953,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -21119,8 +22013,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "hälsa" @@ -21473,26 +22367,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "affär" @@ -21564,8 +22458,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotell" @@ -21715,9 +22609,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turism" @@ -21789,8 +22683,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "historisk" @@ -21861,8 +22755,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21876,5 +22770,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "stenbrott" @@ -21888,5 +22782,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21908,5 +22802,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "hamnbassäng" @@ -21920,5 +22814,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "skog" @@ -21932,7 +22826,7 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" -msgstr "" +msgstr "gårdsplan" #. color farmyard @@ -21953,5 +22847,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "detaljhandel" @@ -21965,5 +22859,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "industri" @@ -21977,5 +22871,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21989,5 +22883,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -22001,5 +22895,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -22056,7 +22950,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "militär" @@ -22070,5 +22964,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "begravningsplats" @@ -22081,5 +22975,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "topp" @@ -22094,5 +22988,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "glaciär" @@ -22106,5 +23000,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "vulkan" @@ -22159,8 +23053,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "naturfenomen" @@ -22174,5 +23068,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "buskage" @@ -22186,5 +23080,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "hed" @@ -22198,5 +23092,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "skog" @@ -22210,5 +23104,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "lera" @@ -22222,5 +23116,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "strand" @@ -22298,8 +23192,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "rutt" @@ -22347,7 +23241,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "gräns" @@ -22489,10 +23383,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "plats" @@ -22540,6 +23434,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adress" @@ -22836,24 +23730,86 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Datalager" - -#~ msgid "Uploading data" -#~ msgstr "Skickar data" +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare." + +#~ msgid "API initialization failed" +#~ msgstr "Misslyckades att initialisera API." + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller " +#~ "laddat ner ett datalager?" + +#~ msgid "No data" +#~ msgstr "Inga data" + +#~ msgid "Update failed" +#~ msgstr "Uppdatering misslyckades" + +#~ msgid "Missing primitive" +#~ msgstr "Primitiv saknas" + +#~ msgid "Layers: {0}" +#~ msgstr "Lager: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick " +#~ "JOSM från." + +#~ msgid "Validate" +#~ msgstr "Validera" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Validera antingen nuvarande urval eller hela datasetet." + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "unnamed" +#~ msgstr "namnlös" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-användarnamn (email)" + +#~ msgid "Aborting..." +#~ msgstr "Avbryter..." #~ msgid "Not implemented yet." #~ msgstr "Inte implementerat ännu." -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Jämka konflikter" - -#~ msgid "There were conflicts during import." -#~ msgstr "Konflikter upptäcktes under import." - -#~ msgid "Object" -#~ msgstr "Objekt" +#~ msgid "Change" +#~ msgstr "Ändra" + +#~ msgid "Rotate" +#~ msgstr "Rotera" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Jämka {0} konflikter i {1} objekt" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "olik" + +#~ msgid "false" +#~ msgstr "falsk" + +#~ msgid "true" +#~ msgstr "sann" + +#~ msgid "their version:" +#~ msgstr "deras version:" #~ msgid "{0} object has conflicts:" @@ -22865,45 +23821,88 @@ #~ msgstr "min version:" -#~ msgid "their version:" -#~ msgstr "deras version:" - #~ msgid "resolved version:" #~ msgstr "jämkad version:" +#~ msgid "Revert" +#~ msgstr "Återgå" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Jämka konflikter" + +#~ msgid "Data Layer" +#~ msgstr "Datalager" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Taggar (tomt värde tar bort taggen)" + +#~ msgid "Occupied By" +#~ msgstr "Innehas av" + +#~ msgid "Add Selected" +#~ msgstr "Lägg till vald" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan inte ansluta till server." + +#~ msgid "Error parsing server response." +#~ msgstr "Fel vid inläsning av serverns svar." + +#~ msgid "There were conflicts during import." +#~ msgstr "Konflikter upptäcktes under import." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Ansluter till OSM-servern" + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Användarnamn (epost) för OSM-kontot" -#~ msgid "OSM username (email)" -#~ msgstr "OSM-användarnamn (email)" - -#~ msgid "Unknown host" -#~ msgstr "Okänd värddator" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "olik" - -#~ msgid "true" -#~ msgstr "sann" - -#~ msgid "false" -#~ msgstr "falsk" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Jämka {0} konflikter i {1} objekt" - -#~ msgid "Change" -#~ msgstr "Ändra" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Klicka på Uppdatera för att uppdatera listan" - -#~ msgid "Revert" -#~ msgstr "Återgå" - -#~ msgid "Date" -#~ msgstr "Datum" +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}" + +#~ msgid "Tagging preset sources" +#~ msgstr "Källor för snabbval för taggning" + +#~ msgid "Tagging preset source" +#~ msgstr "Källa till snabbval för taggning" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Lägg till en källa för snabbval för taggning till listan." + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Justera WMS-lagrets position" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "image not loaded" +#~ msgstr "bilden har inte hämtats" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger " +#~ "musknapp och flytta musen. Välj: Klicka" + +#~ msgid "Commit comment" +#~ msgstr "Bidragskommentar" + +#~ msgid "Charge" +#~ msgstr "Avgift" #~ msgid "" @@ -22914,114 +23913,18 @@ #~ "historiklistan." -#~ msgid "Rotate" -#~ msgstr "Rotera" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Taggar (tomt värde tar bort taggen)" - -#~ msgid "Error parsing server response." -#~ msgstr "Fel vid inläsning av serverns svar." - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan inte ansluta till server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och " -#~ "panorera." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor." - -#~ msgid "Tagging preset source" -#~ msgstr "Källa till snabbval för taggning" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Lägg till en källa för snabbval för taggning till listan." - -#~ msgid "Tagging preset sources" -#~ msgstr "Källor för snabbval för taggning" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Servern svarade med internt fel. Försök med ett mindre område eller " -#~ "försök igen efter en stund." - -#~ msgid "Commit comment" -#~ msgstr "Bidragskommentar" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM." -#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "image not loaded" -#~ msgstr "bilden har inte hämtats" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger " -#~ "musknapp och flytta musen. Välj: Klicka" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Id för Metacartas korrigerade kartbild" - -#~ msgid "rectifier id={0}" -#~ msgstr "korrigeringsid={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Justera WMS-lagrets position" - -#~ msgid "Charge" -#~ msgstr "Avgift" - #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Server does not support changesets" -#~ msgstr "Servern har inte stöd för ändringssamlingar" +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}." #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" #~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):" -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}." +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" #~ msgid "Plugin already exists" #~ msgstr "Insticksmodulen finns redan" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Några av noderna befinner sig (nästan) på linje" - -#~ msgid "Drawbridge" -#~ msgstr "Klaffbro" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" #~ msgid "Really mark this issue as ''done''?" @@ -23029,9 +23932,24 @@ #~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?" +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Importera TCX-fil som GPS-spår" + #~ msgid "Import TCX File..." #~ msgstr "Importera TCX-fil..." -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Importera TCX-fil som GPS-spår" +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id för Metacartas korrigerade kartbild" + +#~ msgid "rectifier id={0}" +#~ msgstr "korrigeringsid={0}" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Drawbridge" +#~ msgstr "Klaffbro" #~ msgid "" @@ -23108,4 +24026,19 @@ #~ msgstr "Fällgaller" +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM." +#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Servern svarade med internt fel. Försök med ett mindre område eller " +#~ "försök igen efter en stund." + #~ msgid "" #~ "The plugin {0} seems to be broken or could not be downloaded " @@ -23113,4 +24046,100 @@ #~ msgstr "" #~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Arkivfil för insticksmodul finns redan tillgänglig. Önskar du hämta " +#~ "nuvarande version genom att ta bort det existerande arkivet?\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Konflikter: {0}" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Klicka på Uppdatera för att uppdatera listan" + +#~ msgid "viaduct" +#~ msgstr "viadukt" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Några av noderna befinner sig (nästan) på linje" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och " +#~ "panorera." + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "" +#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: " +#~ "{0}\n" + +#~ msgid "Basic" +#~ msgstr "Grundläggande" + +#~ msgid "Remove Selected" +#~ msgstr "Ta bort det valda" + +#~ msgid "Server does not support changesets" +#~ msgstr "Servern har inte stöd för ändringssamlingar" + +#~ msgid "Delete and Download" +#~ msgstr "Ta bort och hämta hem" + +#~ msgid "No intersections found. Nothing was changed." +#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats." + +#~ msgid "sports" +#~ msgstr "Sportaffär" + +#~ msgid "Move Down" +#~ msgstr "Flytta nedåt" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "Relationsredigerare:{0}" + +#~ msgid "Move Up" +#~ msgstr "Flytta uppåt" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan " +#~ "skickats in har en historik." + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "" +#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du " +#~ "fortsätta?" + +#~ msgid "Edit Drawbridge" +#~ msgstr "Redigera en klaffbro" + +#~ msgid "Edit Portcullis" +#~ msgstr "Redigera ett fällgaller" + +#~ msgid "The following errors occured during mass download:" +#~ msgstr "Följande fel uppstod vid massnedladdning:" + +#~ msgid "" +#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}" + +#~ msgid "Start routing" +#~ msgstr "Påbörja ruttberäkning" + +#~ msgid "Remove route nodes" +#~ msgstr "Ta bort ruttnoder" #~ msgid "" @@ -23127,63 +24156,4 @@ #~ "Skicka inte in några data efter du har fått detta meddelande." -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Arkivfil för insticksmodul finns redan tillgänglig. Önskar du hämta " -#~ "nuvarande version genom att ta bort det existerande arkivet?\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Konflikter: {0}" - -#~ msgid "viaduct" -#~ msgstr "viadukt" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning" - -#~ msgid "sports" -#~ msgstr "Sportaffär" - -#~ msgid "" -#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}" - -#~ msgid "Delete and Download" -#~ msgstr "Ta bort och hämta hem" - -#~ msgid "No intersections found. Nothing was changed." -#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats." - -#~ msgid "Solve Conflict" -#~ msgstr "Jämka konflikt" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan " -#~ "skickats in har en historik." - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "" -#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du " -#~ "fortsätta?" - -#~ msgid "The following errors occured during mass download:" -#~ msgstr "Följande fel uppstod vid massnedladdning:" - -#~ msgid "Edit Drawbridge" -#~ msgstr "Redigera en klaffbro" - -#~ msgid "Edit Portcullis" -#~ msgstr "Redigera ett fällgaller" - #~ msgid "Helppage missing. Create it in english." #~ msgstr "Hjälpsida saknas. Skapa den på engelska." @@ -23196,10 +24166,4 @@ #~ "\"{1}\">ditt språk." -#~ msgid "Remove route nodes" -#~ msgstr "Ta bort ruttnoder" - -#~ msgid "Start routing" -#~ msgstr "Påbörja ruttberäkning" - #~ msgid "Undeleting Way..." #~ msgstr "Ångrar radering av väg..." @@ -23211,12 +24175,9 @@ #~ msgstr "Återskapar relation..." +#~ msgid "Keep mine" +#~ msgstr "Behåll mina" + #~ msgid "Checking whether primitive {0} is gone ..." #~ msgstr "Kontrollerar huruvida primitiv {0} är borta..." - -#~ msgid "Keep mine" -#~ msgstr "Behåll mina" - -#~ msgid "Delete mine" -#~ msgstr "Radera mina" #~ msgid "" @@ -23235,4 +24196,7 @@ #~ "
Klicka {3} för att avbryta.
" +#~ msgid "Delete mine" +#~ msgstr "Radera mina" + #~ msgid "" #~ "There are {0} primitives
selected for " Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 16826) +++ /applications/editors/josm/i18n/po/tr.po (revision 16827) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:32+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-14 17:53+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Türkçe\n" @@ -18,81 +18,161 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "Arayüz Oluşturuluyor." #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:394 +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "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:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "Saklanılmayan Çalışmalar" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "Bazı çalışmalar saklanılmadı. Değişikliklerden vazgeç ve Devam Et?" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -101,32 +181,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "İptal" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "Uyarı" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Yanlış dosyalr atlanıldı URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "BİLİNMEYEN" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "Hakkında" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "Hakkında penceresini göster." @@ -134,10 +274,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -145,5 +285,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -152,19 +292,19 @@ msgstr "Versiyon {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "En son değişiklik {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "Java Version {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "Başlangıç Sayfası" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "Hata raporları" @@ -174,37 +314,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "Bilgi" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "Okubeni" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "Revizyon" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "Katkılar" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "Eklentiler" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "JOSM Hakkında..." -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "Dosya bulunamadı." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -213,16 +357,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "Uyarı" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -231,7 +368,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "Silmek için bir satır seçiniz." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "Şunların Arasında Seçiniz:" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "Kavşakları Birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "Kavşak Ekle..." @@ -243,14 +408,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -258,57 +425,57 @@ msgstr "Düznele: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "Yeni kavşak için koordinat giriniz." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "Ondalık derece kullan." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ." -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "Enlem" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "Boylam" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "Daire içindeki kavşakları hizala" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "Seçili kavşakları daire içine taşı." -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -324,25 +491,58 @@ msgstr "Araç: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "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:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "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:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "Kavşakları bir çizgiye hizala" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "Seçili kavşakları bir çizgiye taşı." -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "lütfen en az üç kavşak seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -351,18 +551,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -371,5 +563,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -378,46 +570,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "bilgi" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "tabaka" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "selection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "Çelişki" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "{0} a Yaklaş" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "Görünümü {0} a yaklaştır." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -427,30 +619,30 @@ msgstr "Görüntü: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "Yaklaşılacak bir şey yok." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "Yaklaşılacak çelişki 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:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "Lütfen birleştirmek için en az iki yol seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "Farklı sınıflardaki yolları birleştir?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -460,13 +652,13 @@ "istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "Yöneleri değiştir?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -476,10 +668,10 @@ "istermisiniz?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -487,20 +679,20 @@ msgstr "Bütün çelişkilere değer ver." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "{0} yolu birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "Bütün yollar boştu" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -517,23 +709,24 @@ msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "Lütfen kopyalama için seçim yapınız" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "Daire Oluştur" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "Seçili üç noktadan daire oluştur." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "Noktalar daire içinde değiller." -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " @@ -541,87 +734,122 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "Sil" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "Seçili Objeleri Sil." -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "Üzerine Yaz" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "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:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "OSM sitesinden indiriliyor..." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "Harita verisi OSM serverından indiriliyor." -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "Dosya: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "İndir" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "Lütfen en az bir indirme görevi seçiniz" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "İlişkilerde Karışıklık" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "Çift" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "Kopyala ve Yapştır ile seçimi çiftle." @@ -641,5 +869,5 @@ msgstr "Programı Kapat." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -649,58 +877,73 @@ "yüklemek istermisiniz?" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "GPX Yap..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "GPX dosyasına çevir." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "Çevirecek bişey yok. Biraz bilgi edinin." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "gps iz tanımı" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "Yazar bilgisi ekle" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "gerçek İsim" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "Copyright (URL)" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "Öntanımlı" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "Copyright yılı" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "Anahtar kelimeler" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "Dışarı verme opsiyonları" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -711,25 +954,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "Hata" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "Ön tanımlı lisans seçiniz" @@ -739,46 +962,49 @@ msgstr "JOSM Online Yardım Dosyası" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "Tarayıcıda Açınız" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "Düzenle" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "Yenile" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "Yardım dosyalaları sadece online oalrak düzenlebilir" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "Sayfanın yüklenmesinde hata {0}" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -814,30 +1040,40 @@ msgstr "Kavaşağı en yakın yol segmentine birleştir" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "Yol ve Kavşağı birleştir" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "Kısayol Yok" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "Takayı yeniden isimlerdir" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "Bu takayı seçili tabakanın altına koy." + +#: ../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 +#: ../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:73 +#: ../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." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "Farklı özellikli kavşakları birleştir?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -845,68 +1081,79 @@ msgstr "Seçili kavşaklar, farklı ilişkileri var. Birleştirmek istiyormusun?" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 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:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "{0} Kavşak birleştirildi" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "selection" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "Seçili üyeyi aşağı taşı" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "Yukarı" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "Objeleri taşı {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "aşağı" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "sol" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "sağ" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "Taşı {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "Objeleri taşı {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "Objeleri dünya dışına taşıyamazsın." @@ -914,5 +1161,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "Yeni" @@ -922,26 +1169,17 @@ msgstr "Yeni harita oluştur." -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "isimsiz" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "Aç..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "Dosya aç." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "Okunamadı \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -970,34 +1208,35 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "Orthogonalize Shape" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "Kavşakları taşı, açılar 90 veya 270 derece olsun" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "Sadece iki kavşak olabilir" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "Seçimde sadece yollar olmalı." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "EPSG:4326 projeksiyonunu kullanıyorsunuz, projeksiyon istenmeyen " @@ -1005,9 +1244,9 @@ "değiştirmeniz önerilir.
Devam etmek istiyormusunuz?" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "Sadece bir kavşak seçili" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "Orthogonalise" @@ -1023,11 +1262,11 @@ msgstr "Yapıştır hafızasındaki bilgileri yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "Etiketleri Yapıştır" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1056,16 +1295,21 @@ msgstr "Son bitmemiş komutu tekrar yap." -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "Takayı yeniden isimlerdir" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "Dosyayıda yeniden isimlendir" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "Dosyaya isim verilemedi \"{0}\"." @@ -1079,9 +1323,9 @@ msgstr "Seçili yollar için yönü ters çevir." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "Lütfen en az bir yol seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "Yolları ters çevir" @@ -1089,17 +1333,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "Kaydet" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "Şimdiki bilgiyi kaydet." -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1109,25 +1355,25 @@ "bildiriniz" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "Döküman açık değil Kayıt yapılamaz." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "Boş döküman" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "Çelişkiler" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1135,54 +1381,75 @@ msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "OSM dosyası olarak sakla" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "GPX olarak sakla" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "Yedek dosyası oluşturulamadı." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "Bilinmeyen Dosya Uzantısı: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "Kaydetme sırasında bir hata oluştu." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "Yedek dosyası içeri alınırken hata oluştu." + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "Bilinmeyen dosya uzantısı." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "Kaydetme sırasında bir hata oluştu." -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "Yedek dosyası içeri alınırken hata oluştu." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "Farklı Kaydet..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "Varolan bilgileri yeni bir dosyaya kaydet." +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "Hepsini Seç" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1215,16 +1482,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "Yolları Böl" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "Seçili kavşakta yolu böl." @@ -1234,10 +1501,10 @@ msgstr "Yapılan seçim bölme için kullanılamaz." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1249,19 +1516,19 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." msgstr[0] "Seçili yol seçili kavşakları içermiyor." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz." -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1270,19 +1537,23 @@ "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "" "Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n" "Gerek duyulursa kontrol edilmeli" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." +msgstr "" +"Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n" +"Gerek duyulursa kontrol edilmeli" + +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1303,46 +1574,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 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:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 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:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 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:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 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:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 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:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "Şunların Arasında Seçiniz:" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* Birden fazla yol için kullanılan kavşak, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* Birden fazla yol için veya şu yollardan biri için, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" @@ -1351,5 +1622,5 @@ "kullanılabilir, veya" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." @@ -1357,5 +1628,5 @@ "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir." -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1368,9 +1639,9 @@ "kopyalarını oluşturur ve bütün kavşaklar seçilir" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1378,5 +1649,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1392,139 +1663,90 @@ msgstr "Son komutu geri al." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "Seçimleri Kaldır" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "Objelerdeki seçimi kaldır." -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "Seçimleri Kaldır (Odak)" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "Seçimleri Kaldır (Kaçış)" +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +msgid "Update Data" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 -msgid "Update Data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "GPX veri tabaksı bulunamadı." + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "OSM ye yükle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "Bütün değişiklikleri OSM server'ına yükle." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "Eklenilecek objeler:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "Düzenlenecek objeler:" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "Silinecek objeler:" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -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:132 -msgid "Upload these changes?" -msgstr "Değişiklikleri yükle?" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "Yüklenilecek değişiklik yok." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1538,17 +1760,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1559,53 +1781,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#, java-format +msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 +#, java-format +msgid "Uploading failed.
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 +msgid "Upload to OSM API failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "Bütün değişiklikleri OSM server'ına yükle." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 -#, java-format -msgid "Uploading failed.
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 -msgid "Upload to OSM API failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format -msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "Eklenilecek objeler:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "Düzenlenecek objeler:" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +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 "" @@ -1694,42 +1927,54 @@ msgstr "Yavaş İleri Götür" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "GPS verisi indiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "Ham GPS verisi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "Bilgi İndiriliyor" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "İçeri bilgi alınamadı." -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap verisi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "Bilgi yükleniyor" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, java-format +msgid "The following errors occurred during mass download:{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1741,21 +1986,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "Silme Modu" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "Kavşak veya yolları sil." -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1763,5 +2008,5 @@ msgstr "Mode: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1771,749 +2016,23 @@ "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "Çiz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "Kavşakları Çiz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "Mode: Odağı Çiz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "seçilmiş" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -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:493 -msgid "Add node" -msgstr "Kavşak Ekle" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "Yola kavşak ekle" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "Varolan yolu kavşağa ekle" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "Varolan yola kavaşka ekle" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "Yola kavşak ekle ve birleştir" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "Genişlet" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "Alanları Oluştur" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "Yolu genişlet" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "" -"İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"Çalan dosyayı sürükle ve bir izin yakınında bırak; SHIFT+bıraksesi " -"senkronize etmek için." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "Seçiniz" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "Objeyi seç,taşı ve dönder" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "" -"Taşımayı durdurmak için fare düğmesini bırak. Ctrl ile en yakın kavşağa " -"yapıştır." - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "Zoom" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "Zoom ve Harita Taşı" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı Ctrl+Yukarı,aşağı,sol," -"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/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "Ara..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "Objeleri ara." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "Bilgi yüklenemedi." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "Lütfen bir aramametni giriniz." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "seçimi değiştiriniz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "seçime ekleyiniz" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "Seçimden çıkartınız" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "Harf hassas" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "ifade anlatımı" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "Arama" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "''{0}'' için herhangi karşılık bulunamadı" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, 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:183 -#, 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:187 -#, java-format -msgid "Found {0} matches" -msgstr "{0} Eşleşme bulundu" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"İfadede \"{0}\" şu noktada hata var {1}, tam hata:\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "or için eksik argüman." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "not için eksik argüman." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "Parantezlerin kapanması beklenir." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../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:41 -#, java-format -msgid "Contact {0}..." -msgstr "Kontak {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "İndiriliyor..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "Link okunamadı: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "Link ayrıştırılamadı: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "Kaldır \"{0}\" için {1} ''{2}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "Ayarla {0}={1} için {2} ''{3}''" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "obje" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "Kaldır \"{0}\" için {1} {2}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "Ayarla {0}={1} için {2} {3}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "Sil {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "Sil {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "İlişkilerde Karışıklık" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"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:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n" -"İlişkiden Sil?" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "Yol segmentini ayrıştır" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
Göremediğiniz başka " -"objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "Taşı" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "kavşak" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../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:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -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 -#, 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/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "Uygula?" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında " -"değişmesidata bütünlüğü için önerilir." - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "İlişki" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "Eski Rol" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "Yeni Rol" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "Eski Anahtar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "Eski Değer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "Yeni Anahtar" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "Yeni Değer" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "Seçili değişiklikleri uygula" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "Değişiklikleri Uygulama" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -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:96 -msgid "Properties of " -msgstr "Özellikleri " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "İlişkide rolü şunu gösteriyor" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "Otomatic etiket düzetmesi" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "Tercihler klasörü açılamıyor: {0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}." - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "Tercihler {0} üzerinde saklanıldı" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "Could not upload preferences. Reason: {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "Tercihler serverdan alınamadı." - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2525,7 +2044,786 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "Çiz" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "Kavşakları Çiz" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +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/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "seçilmiş" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +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:528 +msgid "Add node" +msgstr "Kavşak Ekle" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "Yola kavşak ekle" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "Varolan yolu kavşağa ekle" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "Varolan yola kavaşka ekle" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "Yola kavşak ekle ve birleştir" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "Genişlet" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "Alanları Oluştur" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "Yolu genişlet" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "" +"İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"Çalan dosyayı sürükle ve bir izin yakınında bırak; SHIFT+bıraksesi " +"senkronize etmek için." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "Seçiniz" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "Objeyi seç,taşı ve dönder" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "" +"Taşımayı durdurmak için fare düğmesini bırak. Ctrl ile en yakın kavşağa " +"yapıştır." + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "Zoom" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "Zoom ve Harita Taşı" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"Sürükleyerek Zoom yap; Ctrl+ veya Ctrl-; beraber taşı Ctrl+Yukarı,aşağı,sol," +"sağzoom taşı ise sağ klik" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "Ara..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "Objeleri ara." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "Lütfen bir aramametni giriniz." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "seçimi değiştiriniz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "seçime ekleyiniz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "Seçimden çıkartınız" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "Harf hassas" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "ifade anlatımı" + +#: ../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:95 +msgid "name:Bak - 'Bak' anywhere in the name." +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, " +"type=, *=*, *=" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +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 +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 "" + +#: ../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 "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +msgid "modified - all changed objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "" + +#: ../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:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "Arama" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "''{0}'' için herhangi karşılık bulunamadı" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, 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 +#, 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 +#, java-format +msgid "Found {0} matches" +msgstr "{0} Eşleşme bulundu" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"İfadede \"{0}\" şu noktada hata var {1}, tam hata:\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "or için eksik argüman." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "not için eksik argüman." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "Parantezlerin kapanması beklenir." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "Seçili alanı yükle" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "Kontak {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "İndiriliyor..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "Link okunamadı: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "Link ayrıştırılamadı: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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 "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}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "obje" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, 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 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "Ayarla {0}={1} için {2} {3}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "Çelişki" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "''{0}'' için herhangi karşılık bulunamadı" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "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 +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?" +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:584 +msgid "Delete from relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n" +"İlişkiden Sil?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "Yol segmentini ayrıştır" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.
Göremediğiniz başka " +"objeler onu kullanıyor olabilir.
Gerçekten silmek istiyormusunuz?" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "Özelliği Sil" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "Taşı" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "kavşak" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../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 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +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 +#, 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/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "Uygula?" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında " +"değişmesidata bütünlüğü için önerilir." + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "İlişki" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "Eski Rol" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "Yeni Rol" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "Eski Anahtar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "Eski Değer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "Yeni Anahtar" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "Yeni Değer" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "Seçili değişiklikleri uygula" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "Değişiklikleri Uygulama" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +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 +msgid "Properties of " +msgstr "Özellikleri " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "İlişkide rolü şunu gösteriyor" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "Otomatic etiket düzetmesi" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, 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}." +msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "Tercihler {0} üzerinde saklanıldı" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, 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 +msgid "Could not load preferences from server." +msgstr "Tercihler serverdan alınamadı." + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" msgstr "" @@ -2554,5 +2852,5 @@ msgstr "D" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2561,62 +2859,62 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "eksik" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "Hata: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "Uyarı: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" msgstr[0] "yol" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" msgstr[0] "ilişki" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2629,23 +2927,23 @@ msgstr[0] "{0} üye" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "Karayolu" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "demiryolu" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "suyolu" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "arazi kullanımı" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2699,5 +2997,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "Alan stili yol kapalı değil." @@ -2835,9 +3133,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2854,5 +3147,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "arkaplan" @@ -2863,8 +3156,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2875,5 +3168,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert Zone (Fransa)" @@ -2896,22 +3189,128 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "Yer imleçleri okunamadı." -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "Yer imleçleri yazılamadı." -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "Tekrar Gösterme" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "bilinmeyen" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "Beklenmedik Durum" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "" +"OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol " +"ediniz." + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +msgid "Unknown host" +msgstr "Tanımsız host" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "Günün Mesajı mevcut değil" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "" @@ -2993,62 +3392,57 @@ msgstr "şifre" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "kullanım" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "seçenekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "Bu Yardımı Göster" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "Standart unix geometry argümanı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "Kutu ile belirlenen sınırları indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "Dosya Aç (ham gps, eğer .gpx ise)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "Kutu ile belirlenen alanı ham gps olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "Yapılan aramaya göre seçim yap" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "Tercihleri varsayılan değerlere getir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "Dil seçimi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "örnekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3058,51 +3452,51 @@ "bir harita yükleyiniz --selection" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "--download= indirmek yerine osm:// kullanabilirsin\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "Güncellenen eklentiler aktif olacak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "Eski eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "Varsayılan ayarlar alınıyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3110,21 +3504,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "Tel Görünümü" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "Tel Göünümünü İşaretle" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "Ses" @@ -3168,53 +3562,68 @@ msgstr "ölçek" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "Fare imleci üzerindeki coğrafi boylam." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "Fare imleci üzerindeki objenin adı." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "Fare imleci üzerindeki coğrafi enlem." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "Önceki ve şimdiki yol kısımları arasındaki açı." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "Segment çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "Yeni yol segmentinin uzunluğu çizildi." -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(obje yok)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "tabaka listede yok." -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "OSM serverına bağlanılıyor..." - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "Ayrıştırma esnasında hata" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 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 @@ -3236,4 +3645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "Ayarlar Okunuyor" @@ -3265,20 +3675,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3286,47 +3696,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "Üyeler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3334,25 +3744,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "" @@ -3389,5 +3799,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "" @@ -3398,5 +3808,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3410,5 +3820,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "" @@ -3483,7 +3893,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3557,14 +3966,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "" @@ -3593,10 +4002,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3605,19 +4014,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3626,9 +4035,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3638,13 +4047,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3652,90 +4061,90 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "silindi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3745,5 +4154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "" @@ -3768,12 +4177,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3818,10 +4226,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3830,10 +4238,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3842,5 +4250,5 @@ msgstr "Değer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "" @@ -3900,9 +4308,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3910,5 +4318,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3938,42 +4346,59 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "Haritada seçili elemanları listedede seç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141 +msgid "" +"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " +"Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 +msgid "Cancel conflict resolution and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +msgid "Apply Resolution" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "Kapanmamış yollar" + +#: ../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:151 -msgid "Cancel conflict resolution and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166 -msgid "Apply Resolution" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 -msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format -msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "Çelişkileri Çözümle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3991,96 +4416,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "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:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "Tabakalar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +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:272 msgid "Delete the selected layer." msgstr "Seçili tabakayı sil." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "Kayıt edilmemiş çalışmalar var. Buna rağmen tabaka silinsin mi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "Gerçekten bütün tabakayı silmek istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "Bilgi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "Evet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "K" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "Sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "Sil {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "Göster/Sakla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "Seçili tabakanın görünen kısmını sabitle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "Göster/Sakla Metin/İkon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "Görünen metin ve ikonları sabitle." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "Tabakalar" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -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:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "özel" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "Seçili tabakayı sil." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "Bu takayı seçili tabakanın altına koy." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 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:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 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/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "Bu takayı seçili tabakanın altına koy." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "Tabakalar: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "Bilgi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4088,22 +4547,28 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "Boş değer anahtarı sildi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "Değerleri Değiştir?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4111,84 +4576,89 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "Lütfen bir anahtar seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "Lütfen bir değer seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "Özellikler/Üyelikler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "Seçili objenin özellikleri" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "İlişkiyi değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "Özellikleri Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "Seçili anahtarın değerini her obje için düzenle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "Özelliği Sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "Seçili anahtarı her objeden sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Özellik: {0} / Üyelik: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "Özellik / Üyelik" @@ -4197,63 +4667,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "İlişkiler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "İlişkilerin listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "İlişkiler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +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:284 +msgid "Delete the selected relation" +msgstr "Seçili ilişkiyi sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "Yeni ilişki oluştur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "İlişkiler: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -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:274 -msgid "Delete the selected relation" -msgstr "Seçili ilişkiyi sil" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "Güncel Seçim" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "Seçim listesi penceresini aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "Seçili eleman(lara) yakınlaş" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "Seçim listesini yenile." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "Seçime yakınlaş" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "Seçim" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4261,5 +4733,5 @@ msgstr[0] "{0} Yol" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4267,5 +4739,5 @@ msgstr[0] "{0} İlişki" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4276,148 +4748,420 @@ msgstr "Panelin kilidini Kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "paneli büyütüp/küçültmek için tıklayınız" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "Yazarlar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "Seçili obje üzerinde çalışna kişilerin listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "yazar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# Objeler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "Yazarlar: {0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -msgid "Apply Changes" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "Meşgul Eden" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "Alanı indir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "Seçili ilişkiyi sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "Görünen mozaikleri indir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "İlişkiler" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "Bilgi İndiriliyor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "İlişkiler" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "Son bitmemiş komutu tekrar yap." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "Seçileni Ekle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "Seçili bütün objeleri üye olarak ekle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "Seçili üyeyi aşağı taşı" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "Seçili ilişkiyi sil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "Bağlı Değil" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "İlişkilerde Karışıklık" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "Şimdiki bilgiyi kaydet." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "OK" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -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:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +msgid "Yes, apply it" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "uzak kontrol haereketini onayla" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "Zoom Out" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "Seçili üyeyi aşağı taşı" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +msgid "Apply Changes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "Seçili alanı yükle" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4427,5 +5171,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4435,25 +5179,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "Sık Kullanılanlar" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "lütfen ilk olarak istenilen koordinatı giriniz." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "Lütfen bu yer için bir isim giriniz." -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "seçime ekleyiniz" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz." @@ -4486,34 +5227,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "Bilgi Kaynağı ve Tipi" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "Yeni tabaka olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "Alanı indir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "Seçilen alan çok büyük; server iptal edecektir" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "Seçilen alan uygun, server kabul edecektir" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "Lütfen aranacak bir metin giriniz" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "Arama sonucu server dan alınamadı" @@ -4521,5 +5262,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "Aranacak yerin adını giriniz:" @@ -4527,5 +5268,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4533,6 +5274,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "sism" @@ -4571,6 +5312,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4593,15 +5334,15 @@ msgstr "tip" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "yakın" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "yaklaş" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4610,5 +5351,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "Hareketli Harita" @@ -4640,5 +5381,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "" @@ -5380,5 +6127,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5545,197 +6292,187 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "{0} için görüntüler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "GPX Oku..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "Noktalrı için {0} x {1} zaman yok" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Zaman şu noktalar \"{0}\" {1} x {2} için okunamadı" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "Zaman damgası okunabilen bir görüntü bulunamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "{0} Okunuyor..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "Geotagged Görüntüler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS başlangıç: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS bitiş: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "şu anki delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "zaman dilimi farkı: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" msgstr[0] "görüntü" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} izde var." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "Saati eşle" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG görüntüsü (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "EXIF zamanı \"{0}\" dosyasında yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "Görüntü" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS ünitesi zamandilimi (resim farkı)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "Girilen zaman ayrıştırılamadı." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps noktası" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "Çizimi özelleştir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "Genel ayarları kullan." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "Bu tabaka için çizgiler arasını birleştir." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "Bu tabaka için çizgileri birleştirme." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "Çizim seçeneklerini seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "Renkleri Ayarla" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "OK" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "Varsayılan" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "Renk seç" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "işaretli noktalardan imleçler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "{0} isim verilen izler" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "Sesi içeri al" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave Audio files (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "{0} daki ses imleçleri" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "Görüntüleri içeri al" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5743,5 +6480,5 @@ msgstr[0] "{0} iz, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5749,5 +6486,5 @@ msgstr[0] "{0} rut, " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5755,30 +6492,30 @@ msgstr[0] "{0} yol noktaları" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "İsim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "Tanım: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "Zaman_aralığı: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "Uzunluk: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "Bilgi tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5788,43 +6525,43 @@ "yüklemek isterseniz buraya bakınız:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "Çevrildiği yer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} metre" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} km2" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5835,9 +6572,9 @@ "istiyor musunuz?" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok." -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5845,5 +6582,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5852,47 +6589,47 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} silindi.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5916,10 +6653,10 @@ msgstr[0] "iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" msgstr[0] "nokta" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5927,5 +6664,5 @@ msgstr[0] "{0} noktalı iz" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5933,5 +6670,5 @@ msgstr[0] "{0} {1} izden oluşur" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5948,5 +6685,5 @@ msgstr[0] "imleç" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5954,29 +6691,29 @@ msgstr[0] "{0} {1} imleçten oluşur" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "Sesi Eşle" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "Eşlemeye yardımcı bir ses duyduğunuzda, çalan sesi durdurunuz." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "Ses {0} noktasında eşlendi." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "Çalan tabakada eşleme yapılamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "Ses dosyasının başlangıcını işaretle" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5984,10 +6721,17 @@ msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "Sesi işaretleyecek herhangi bir nesne yok." -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "Göster/Sakla Metin/İkon" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "Görünen metin ve ikonları sabitle." + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5995,5 +6739,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -6003,29 +6747,29 @@ "sürükleyiniz." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "Yeni ses imleci oluşturulamadı." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "Bu imleç için tanımlanan link gösterilemedi." -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL : " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "Linkin gösterilmesinde hata" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "İleri Tercihler" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "Tercihleri doğrudan ayarla. Dikkatli kullanılmalı!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6033,26 +6777,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "Seçim varsayılan değer." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "Varsayılan değer ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "Editlemek için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6060,14 +6804,14 @@ msgstr "{0} için yeni değer" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "Silmek için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "Yeni bir anahtar/değer çifti gir" @@ -6195,40 +6939,40 @@ msgstr "Ses kayıt cihazı kalibrasyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Renk" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "Boya Stili {0}: {1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "Seç" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "{0} için bir renk seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "JOSM da farklı objlerin kullandığı renkler." -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "Renkler" @@ -6558,46 +7302,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "Yüklü eklentileri ayarla." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" msgstr "İndirme listesi" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101 msgid "Update" msgstr "Güncelle" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "Siteleri Ayarla..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "Lütfen bir seçim yapınız." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../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 msgid "Configure Plugin Sites" msgstr "Eklenti sitelerini ayarla" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "Ayarları Göster" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6605,29 +7357,29 @@ msgstr "Programın görünüşünü değiştirmeye yarayan bir çok ayar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "Bağlantı Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "OSM server bağlantı ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "Harita Ayarları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "Harita Projeksiyonu ve İnterpolasyon Ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "Ses 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 audio player and audio markers." msgstr "Ses çalıcısı ve ses imleç ayarları." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız." @@ -6728,59 +7480,61 @@ msgstr "Kısayol" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "Kopyalamak için bir satır seçiniz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "Seçili kaynağı listeden sil." -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6961,33 +7715,33 @@ msgstr "Düzenleyici Grupları" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "Seçilebilen Özellikler:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "''{1}'' gurubu için ''{0}'' kullan" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "''{0}'' ı kullan" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6998,15 +7752,15 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -7015,18 +7769,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -7037,55 +7791,58 @@ msgstr "Varolan Grup ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "OSM Server'ına Bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "{0} ve {1} arası bilgiler indiriliyor" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "OSM bilgisi indiriliyor..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "Bilgiler hazırlanıyor..." +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "Okunamadı \"{0}\"" + #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 msgid "GPX Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "İmleçler {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7101,10 +7858,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "OSM 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 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7112,48 +7888,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "İçeri alınan koordinatlar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "Yanlış cümleler: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Kontoltoplamı hatası: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "Bilinmeyen cümleler: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "Sıfır koordinatlar: " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA içeri alınması başarılı" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA içeri alınmasında hata!" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7162,15 +7937,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7178,23 +7953,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "Açılıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "Hazırlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "Yükleniyor..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "Klasör aranıyor {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7237,9 +8025,4 @@ msgid "Login" msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "İptal Edildi..." #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 @@ -7290,66 +8073,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "Ayrıştırma sırasında hata oluştu." -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "Bilinmeyen versiyon" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "-bileşene erişelemdi." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr " in içi boş" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr ". eleman ile bağlantı bulunamadı." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "Ref=0, eksik tanımı." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "Geçersiz obje bulundu id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7357,46 +8144,66 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "Gerekli özellik eksik \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "Yanlış tanımlı kavşak bilgisi" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "Server'e bağlanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." @@ -7405,5 +8212,18 @@ "ediniz." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7412,16 +8232,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "Eklentileri Güncelle" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "" @@ -7438,5 +8253,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7445,23 +8260,23 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "" @@ -7472,32 +8287,30 @@ msgstr "Eklentide hata oluştu {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "Uyarı - {0} eklentisi istenildi. Eklenti artık gerekli değil." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "Eklenti Bulunamadı: {0}." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "En son eklenti güncellemesi {0} gün önce yapıldı." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7507,21 +8320,21 @@ "değiştirebilirsin.
" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "Eklentiyi Pasif Yap" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7531,5 +8344,5 @@ "üzerine yazma yetkisi varmıdır kontrol ediniz." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7537,10 +8350,10 @@ msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "Eklenti Yazarın {0} Olduğunu Belirtiyor." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." @@ -7548,9 +8361,9 @@ "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "Eklentiyi Pasif Hale Getireyim mi?" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7560,25 +8373,23 @@ "çalıştırın." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "Bilgi" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "Eklenti bilgisi bulunamadı." + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "Açıklama mevcut değil" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7586,13 +8397,18 @@ msgstr[0] "{0} sitesinden indirilen eklenti" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "Eklenti bilgisi bulunamadı." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "Bütün eklentiler güncel." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7605,9 +8421,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "Eksik eklentileri yükle" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7620,57 +8436,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "bilinmeyen" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}: Versiyon {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "Eklenti JOSM ile beraber geliyor." -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "Eklentinin açıklaması okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "Bu kayıdın sonunda." -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "Sesin çalıştırılmasında hata" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "Birşey Yapma" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "hatayı Bildir" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7684,18 +8478,18 @@ "hatayı bildiriniz" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "Beklenmedik Durum" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "Lütfen {0} 'daki problemi bildiriniz" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "Hatayı oluşturan adımları belirtiniz (Mümkün olduğunca detaylı)!" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7705,17 +8499,33 @@ "deneyiniz." -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "Aşağıdaki bilgiyi eklediğinizden emin olunuz:" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "(Metin zaten panoda mevcut.)" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "Tekrar Gösterme" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7728,5 +8538,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7736,5 +8546,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7745,13 +8555,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(İpucu: Kısayolları Tercihler Penceresinden Değiştirebilirisiniz.)" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7759,21 +8584,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7781,74 +8606,75 @@ msgstr "İzleri Yükle" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "Bağlanıyor..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "" +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 +msgid "GPX upload was successful" +msgstr "" + #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 -msgid "GPX upload was successful" -msgstr "" - -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 msgid "Upload failed. Server returned the following message: " msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "GPX tabakası seçili değil. İz yüklenemez." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "İzleri Yükle" @@ -7918,33 +8744,34 @@ msgstr "Seçilen yollardan birisi null !!!" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "Fotoğraflar okunuyor..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "Kananoik yol klasör için bulunamadı {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "Klasör aranıyor {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "Klasörde null dosya bulundu {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "Klasörden dosya alınmasında hata oluştu {0}\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "GPX e göre ilişkilendir" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7964,15 +8791,15 @@ msgstr "GPX Dosyaları (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "Ayrıştırma sırasında hata {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7984,34 +8811,34 @@ "seçiniz
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "Fotoğraf zamanı (exif den):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps zamanı (fotoğraftan okundu): " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [gg/aa/yyyy sa:dk:sn]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "Şu zaman dilimindeyim: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "Tarih Yok" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "Başka bir fotoğraf aç" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "GPS receiver ile Fotoğrafın zamanını eşitle" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -8021,69 +8848,69 @@ "Lütfen istenen formatı kullanın" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "Geçersiz Tarih" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX izi: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "Başka GPX izi aç" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "Zamandilimi: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "Offset:" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "GPS alıcımın resmini çizebilirim.
yardımcı olurmu?" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "Burası için pozisyon güncelle: " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "Bütün imajlar" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "exif pozisyonu olmayan imajlar" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "imaj henuz etiketlenmedi" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "imaj ile GPX izini ilişkilendir" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "GPX izi seçmelisiniz" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "seçili GPX izi yok" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8094,9 +8921,9 @@ "İstenen format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "Geçersiz zaman dilimi" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8107,65 +8934,65 @@ "İstenen format: {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "Geçersiz offset" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX izi yüklendi" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8173,13 +9000,13 @@ msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "" @@ -8201,5 +9028,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" @@ -8222,6 +9049,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "" @@ -8385,22 +9212,22 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8408,18 +9235,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "" @@ -8531,6 +9358,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "Boş Tabaka" @@ -8559,5 +9386,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8566,14 +9393,14 @@ msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 +msgid "Cache Format Error" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 +#, java-format +msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" +msgstr "" + #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 -msgid "Cache Format Error" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 -#, java-format -msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 msgid "Cache Lambert Zone Error" msgstr "" @@ -8661,4 +9488,9 @@ msgstr "Sırasız yolları çiftleyemem." +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "Bilgi yüklenemedi." + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8669,9 +9501,9 @@ msgstr "Çiftli yol oluştur" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "" @@ -8792,30 +9624,30 @@ msgstr "verinin içeri alınmasından sonra sil" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "Aletten veri alınıyor." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "DG100 den veri alınıyor..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "Veri silinmesinde hata." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "veri burdan yüklendi {0}" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "Cihazda veri bulunamadı." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "Bağlantı hatası." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8826,14 +9658,14 @@ "mack.de/josm-globalsat-gpx-import-plugin/" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat İçeri AL" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "Globalsat Datalogger DG100 'dan veriyi GPX tabakasına al." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "İçeri Al" @@ -8924,40 +9756,40 @@ msgstr "ImageWayPoint ile görüntüleri aç" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "Yön indexi'{0}' bulunamadı" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "Başlangıç noktası seçim alanı içinde değil" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "Kıyı şeridi aranıyor..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "bulunan noktalar {0}..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Göl Yürüyüşü." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Göl Yürüyüşü" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "Hafıza alanı oluşturulamadı(cache): {0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "İzleniyor" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "hafıza kontrol ediliyor..." @@ -8966,26 +9798,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "vertex düzeltme çalıştırıldı..." -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "Douglas-Peucker çalışması yapılıyor..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "Çift noktalar kaldırılıyor..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Gölyürüyüşü takip ediliyor" @@ -9070,7 +9894,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "su" @@ -9223,9 +10047,9 @@ msgstr "Gölyürüyüşü eklentisi tercihleri" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "Görüntü mozaiği indiriliyor..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "Görünüt alınamadı" @@ -9468,18 +10292,18 @@ msgstr "Bilinmeyen konu durumu" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "Görünür Aç..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "Sadece şimdiki ekrandaki görünen dosyaları aç." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "Görünüm açılamadı-Sınırlar belirlenemiyor" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9506,33 +10330,33 @@ msgstr "Firefox exe" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "API den veri yükle" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "Seçimi değiştir" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "Görünüm yerini değiştir" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "Uzak kontol hareketlerini, manual kontrol et" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "Uzak Kontrol" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "Uzak kontrol eklenti ayarları." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9543,28 +10367,28 @@ "uygulamaların eklenti ile haberleşmesi için kullanılır." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "Onaylanan Hareket" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu." -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "İstek Detayı: {0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "Buna izin veriyormusunuz?" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "uzak kontrol haereketini onayla" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:" @@ -9828,4 +10652,25 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "" +msgstr[1] "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 msgid "Group" @@ -10075,33 +10920,33 @@ msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "" @@ -10132,6 +10977,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "Onaylama Hataları" @@ -10141,10 +10986,10 @@ msgstr "Onaylama hatası yok" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "Grid" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10234,23 +11079,15 @@ msgstr "Veri doğruluğunu kontrol et" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "Hatalar içeren veri. Yinede yükle?" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "Onaylama penceresini aç." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "Probleme Yaklaş" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "Onayla" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "Aktif seçimi veya bütün veriyi onayla." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10323,22 +11160,22 @@ msgstr "kesişine yollar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "Çift Noktalar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "çift yol noktaları." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "Yolların ardışık özdeş noktalar içermesini kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "Çift yol noktaları" @@ -10412,24 +11249,24 @@ msgstr "Bu test yazım hatalarına karşı test yapar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "Özellik kontol edici :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "" "Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "Geçersiz etkiket kontrol satırı - {0}: {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "Geçersiz imla yanlışı satırı: {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10440,7 +11277,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "Geçersiz etiket/anahtar kombinasyonu" @@ -10448,60 +11285,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:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "Renklendirme problemi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "Anhatar ''{0}'' geçersiz ." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "Boş değerli etiketler" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "Geçersiz özellik anahtar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "Özellik anahtarında geçersiz -boşluk- karakteri" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "Özellik anahtarı HTML bilgisi içeriyor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "Beni Düzelt!" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "Özellik anahtarını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "" @@ -10509,20 +11346,22 @@ "kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "Karışık özellik kontrolu kullan." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "" "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "Etiket kontrolcusu kaynağı" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10531,82 +11370,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:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 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:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "Seçili kaynağı kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "Veri kaynakları" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "Özellik değerlerini kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "Beni Düzelt! leri kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "Beni Düzelt! değeri içeren yol veya noktalara bak." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "Renklendirme notlarını kontro let." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "Harita renklendirme hata durumunu 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:736 msgid "Use default data file." msgstr "Varsayılan veri dosyasını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "Varsayılan veri dosyasını kontrol et (önerilen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use the default tag ignore file (recommended)." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744 msgid "Use default spellcheck file." msgstr "Varsayılan imla dosyasını kontrol et." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Use the default spellcheck file (recommended)." msgstr "Varsayılan imla dosyasını kontrol et (önerilen)." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "Özellikler Düzelt" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "Eleman tipi bulunamadı" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "Uyarı seviyesi bulunamadı" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "Hatalı söylem ''{0}''" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10751,7 +11590,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "yapılar" @@ -10765,5 +11604,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "alan" @@ -10798,10 +11637,10 @@ msgstr "Bağlı yolun sonuda başka yol var" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "Etiketsiz ve bağlı olmayan yollar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "" @@ -10856,8 +11695,32 @@ msgstr "Ters çizilmiş yer: kara solda değil" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10868,10 +11731,10 @@ msgstr "" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "" @@ -10920,14 +11783,14 @@ msgstr "WMS Eklenti Yardımı" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "Rectifiye İmaj..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10938,26 +11801,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10965,5 +11828,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "" @@ -10973,5 +11836,5 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10980,19 +11843,19 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "Otomatik indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS tabakası ({0}), görüntü seviyesi {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -11001,88 +11864,88 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 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:325 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "Veri yüklemek için boş bir WMS tabakası aç" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "WMS Eklenti Tercihleri" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "WMS eklenti menusundeki, WMS server listesini değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "Menu İsmi" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS linki" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "Menu ismi (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS linki (Varsayılan)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "Menu ismi ve WMS linki kullanınız" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "Varsayılanı kopyala" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" msgstr "" @@ -11191,11 +12054,16 @@ msgstr "" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11205,10 +12073,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11216,5 +12084,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11224,5 +12092,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11232,15 +12100,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11248,5 +12116,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11254,5 +12122,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11261,15 +12129,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11278,10 +12146,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11290,15 +12158,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11308,10 +12176,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11320,5 +12188,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11327,5 +12195,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11333,11 +12201,18 @@ msgstr "" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12492,58 +13367,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12557,6 +13380,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "araçyolu" @@ -12582,6 +13405,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "ana_hat" @@ -12607,6 +13430,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "birincil" @@ -12632,6 +13455,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "ikincil" @@ -12645,5 +13468,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "üçüncül" @@ -12661,5 +13484,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "yerleşim_alanı" @@ -12693,6 +13516,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "servis" @@ -12719,6 +13542,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "inşaat" @@ -12768,5 +13591,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "roundabout-döner kavşak" @@ -13745,5 +14568,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "batak" @@ -15474,27 +16297,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "spor" @@ -18333,7 +19156,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "bisiklet" @@ -18403,7 +19226,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "ayak" @@ -18429,5 +19252,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "metro" @@ -18918,13 +19741,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "kırılmış" @@ -18966,5 +19789,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "at" @@ -19184,4 +20007,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "motor" + #. color tertiary #. @@ -19216,6 +20101,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "sokak" @@ -19271,7 +20156,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "araçyolu_hattı" @@ -19327,8 +20212,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "demiryolu" @@ -19349,5 +20234,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19361,5 +20246,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19380,5 +20265,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "turningcircle-döner kavşak" @@ -19393,5 +20278,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19406,5 +20291,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "riverbank" @@ -19418,5 +20303,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "akış" @@ -19430,5 +20315,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "iskele" @@ -19456,5 +20341,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "su_kemeri" @@ -19622,13 +20507,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "insan yapımı" @@ -19690,7 +20575,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "demiryolu_noktası" @@ -19713,10 +20598,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "başka_demiryolu" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "demiryolu_üzeri" @@ -19752,7 +20637,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "eski_demiryolu" @@ -19797,6 +20682,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "havayolu" @@ -19810,5 +20695,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "terminal" @@ -19830,5 +20715,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "havayolu_ağır" @@ -19842,5 +20727,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "hafif_hafif" @@ -19888,7 +20773,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "havayolu" @@ -19905,5 +20790,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "basit_meydan" @@ -19918,5 +20803,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "orta_meydan" @@ -19931,5 +20816,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "büyük_meydan" @@ -19944,5 +20829,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19957,5 +20842,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "acemiKullanıcı_meydanı" @@ -19970,5 +20855,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "acemiKullanıcı_meydanı" @@ -20073,10 +20958,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "güç" @@ -20090,5 +20975,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "iskele" @@ -20102,5 +20987,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "suhattı" @@ -20228,12 +21113,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "dinlenme_yeri" @@ -20247,5 +21132,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20317,8 +21202,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "dinlenme_yeri" @@ -20420,10 +21305,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "tail_trafiği" @@ -20809,22 +21694,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "eski_sokak_lambası" @@ -20856,6 +21741,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "su_lambası" @@ -20916,8 +21801,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "sağlık" @@ -21270,26 +22155,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "alışveriş" @@ -21361,8 +22246,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "hotel" @@ -21512,9 +22397,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "turizm" @@ -21586,8 +22471,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "tarihi" @@ -21658,8 +22543,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "yeşil" @@ -21673,5 +22558,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "taş_ocağı" @@ -21685,5 +22570,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "toprak_doldurma" @@ -21705,5 +22590,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "havza" @@ -21717,5 +22602,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "orman" @@ -21729,5 +22614,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "çiftlik" @@ -21750,5 +22635,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "perakende" @@ -21762,5 +22647,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "endüstri" @@ -21774,5 +22659,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "ağaçsız_alan" @@ -21786,5 +22671,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "yeşil_alan" @@ -21798,5 +22683,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "demiryolu" @@ -21853,7 +22738,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "askeri" @@ -21867,5 +22752,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "mezarlık" @@ -21878,5 +22763,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "zirve" @@ -21891,5 +22776,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "buzul" @@ -21903,5 +22788,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "volkanik" @@ -21956,8 +22841,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "doğal" @@ -21971,5 +22856,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "çalılık" @@ -21983,5 +22868,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "çalılık" @@ -21995,5 +22880,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "orman" @@ -22007,5 +22892,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "çamur" @@ -22019,5 +22904,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "sahil" @@ -22095,8 +22980,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "rut" @@ -22144,7 +23029,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "sınırlar" @@ -22286,10 +23171,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "yer" @@ -22337,6 +23222,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "adres" @@ -22633,105 +23518,20 @@ msgstr "" -#~ msgid "Data Layer" -#~ msgstr "Bilgi Tabakası" - -#~ msgid "Uploading data" -#~ msgstr "Bilgi yükleniyor" - -#~ msgid "Not implemented yet." -#~ msgstr "Henuz Yapılmadı." - -#~ msgid "Email" -#~ msgstr "E-Mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Çelişkileri Çözümle" - -#~ msgid "There were conflicts during import." -#~ msgstr "İçeri taşıma esnasında karşıklık oluştu." - -#~ msgid "Object" -#~ msgstr "Obje" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objede çakışma var:" - -#~ msgid "my version:" -#~ msgstr "versiyonum:" - -#~ msgid "their version:" -#~ msgstr "onların versiyonu:" - -#~ msgid "resolved version:" -#~ msgstr "çözülen versiyon:" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSM için Login adı (email) ." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM kullanıcı_adı (e-mail)" - -#~ msgid "Unknown host" -#~ msgstr "Tanımsız host" - -#~ msgid "position" -#~ msgstr "pozisyon" - -#~ msgid "different" -#~ msgstr "farklı" - -#~ msgid "true" -#~ msgstr "doğru" - -#~ msgid "false" -#~ msgstr "yanlış" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Çözümle {0} karşıklıkları {1} objelerinde" - -#~ msgid "Change" -#~ msgstr "Değiştir" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Tazelemek için Yenile düğmesine basınız" - -#~ msgid "Revert" -#~ msgstr "Değiştir" - -#~ msgid "Date" -#~ msgstr "Tarih" +#~ msgid "Layers: {0}" +#~ msgstr "Tabakalar: {0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır" #~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir" - -#~ msgid "Rotate" -#~ msgstr "Dönder" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etiket (Boş değerler etiketi siler)" - -#~ msgid "Error parsing server response." -#~ msgstr "Serverın cevabı tanımlanamdı." - -#~ msgid "Cannot connect to server." -#~ msgstr "Server'a bağlantı kurulamadı." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Fare veya Ctrl+ok tuşları ile /./ zoom ve pan yapabilirsin." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "site-josm.xml veya Wiki Pages ekle." - -#~ msgid "Tagging preset source" -#~ msgstr "İlk ayarların kaynağı gösteriliyor" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Yeni bir etiketleme ayar dosyası ekle." - -#~ msgid "Tagging preset sources" -#~ msgstr "Etiketleme ayar kaynakaları" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın" + +#~ msgid "Validate" +#~ msgstr "Onayla" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Aktif seçimi veya bütün veriyi onayla." #~ msgid "" @@ -22745,48 +23545,4 @@ #~ msgstr "Açıklamayı Kabul Ediniz" -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Eklenti güncelledi. Programı yeniden açınız." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Eklenti indirilemedi: {0} ve {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigasyon" - -#~ msgid "image not loaded" -#~ msgstr "görüntü yüklenemedi" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi " -#~ "oynat.Seçim:Klik" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier imaj id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "WMS tabakasının pozisyonunu ayarla" - -#~ msgid "Charge" -#~ msgstr "Para Değişim" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Düzeltme)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - #~ msgid "Server does not support changesets" #~ msgstr "Bu bu bilgiyi desteklemiyor." @@ -22795,33 +23551,62 @@ #~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):" -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}." - -#~ msgid "Plugin already exists" -#~ msgstr "Eklentiler zaten mevcut" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Eklentinin silinmesinde hata: {0}" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "bazı kavşaklar zaten hizada" - -#~ msgid "Drawbridge" -#~ msgstr "Asma Köprü" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK+)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "Gerçekten ''yapılmış'' olarak işaretlemek istiyormusunuz?" - -#~ msgid "Import TCX File..." -#~ msgstr "TCX Dosyası içeri al..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "TCX Dosyasını GPS izi olarak içeri al" +#~ msgid "Aborting..." +#~ msgstr "İptal Edildi..." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Fare veya Ctrl+ok tuşları ile /./ zoom ve pan yapabilirsin." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "OSM serverına bağlanılıyor..." + +#~ msgid "Occupied By" +#~ msgstr "Meşgul Eden" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etiket (Boş değerler etiketi siler)" + +#~ msgid "Add Selected" +#~ msgstr "Seçileni Ekle" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Seçili bütün objeleri üye olarak ekle" + +#~ msgid "There were conflicts during import." +#~ msgstr "İçeri taşıma esnasında karşıklık oluştu." + +#~ msgid "Error parsing server response." +#~ msgstr "Serverın cevabı tanımlanamdı." + +#~ msgid "Cannot connect to server." +#~ msgstr "Server'a bağlantı kurulamadı." + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Tazelemek için Yenile düğmesine basınız" + +#~ msgid "Object" +#~ msgstr "Obje" + +#~ msgid "Date" +#~ msgstr "Tarih" + +#~ msgid "Revert" +#~ msgstr "Değiştir" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "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}" +#~ msgstr "Çeşişkiler: {0}" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSM için Login adı (email) ." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM kullanıcı_adı (e-mail)" #~ msgid "" @@ -22834,4 +23619,7 @@ #~ "gönderilmektedir.
Değerli bir şifre kullanmayınız." +#~ msgid "Tagging preset source" +#~ msgstr "İlk ayarların kaynağı gösteriliyor" + #~ msgid "" #~ "The sources (URL or filename) of tagging preset definition files. See " @@ -22841,6 +23629,138 @@ #~ "openstreetmap.de/wiki/TaggingPresets." +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Yeni bir etiketleme ayar dosyası ekle." + +#~ msgid "Tagging preset sources" +#~ msgstr "Etiketleme ayar kaynakaları" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xml veya Wiki Pages ekle." + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "Eklenti arşivi zaten mevcut. Yeni listeyi indirmek istiyormusunuz? eski " +#~ "liste silinecek!\n" +#~ "\n" +#~ "{0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Eklentiler zaten mevcut" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Eklentinin silinmesinde hata: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objede çakışma var:" + +#~ msgid "my version:" +#~ msgstr "versiyonum:" + +#~ msgid "their version:" +#~ msgstr "onların versiyonu:" + +#~ msgid "resolved version:" +#~ msgstr "çözülen versiyon:" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Eklenti güncelledi. Programı yeniden açınız." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Eklenti indirilemedi: {0} ve {1}" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ." + +#~ msgid "Rotate" +#~ msgstr "Dönder" + +#~ msgid "Change" +#~ msgstr "Değiştir" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Çözümle {0} karşıklıkları {1} objelerinde" + +#~ msgid "true" +#~ msgstr "doğru" + +#~ msgid "false" +#~ msgstr "yanlış" + +#~ msgid "position" +#~ msgstr "pozisyon" + +#~ msgid "different" +#~ msgstr "farklı" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "Projeksiyon \"{0}\" şu alanlar için tasarlandı\n" +#~ "enlem 46.1° ve 57° arası.\n" +#~ "Lütfen farklı bier projeksiyonu seçiniz\n" +#~ "eğer Fransız WMS kullanmıyorsanız.\n" +#~ "Bu mesajdan sonra herhangi bir şey yükleme." + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Email" +#~ msgstr "E-Mail" + +#~ msgid "unnamed" +#~ msgstr "isimsiz" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "bazı kavşaklar zaten hizada" + +#~ msgid "Data Layer" +#~ msgstr "Bilgi Tabakası" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "Gerçekten ''yapılmış'' olarak işaretlemek istiyormusunuz?" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir" + +#~ msgid "Import TCX File..." +#~ msgstr "TCX Dosyası içeri al..." + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "TCX Dosyasını GPS izi olarak içeri al" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi " +#~ "oynat.Seçim:Klik" + +#~ msgid "image not loaded" +#~ msgstr "görüntü yüklenemedi" + #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Metacarta linkinden Rektifiye dosyayı indiriniz" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier imaj id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "WMS tabakasının pozisyonunu ayarla" #~ msgid "" @@ -22891,45 +23811,36 @@ #~ "format=image/png" +#~ msgid "Navigation" +#~ msgstr "Navigasyon" + +#~ msgid "viaduct" +#~ msgstr "viyadük" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Düzeltme)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK+)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +#~ msgid "Drawbridge" +#~ msgstr "Asma Köprü" + #~ msgid "Portcullis" #~ msgstr "Demir parmaklık" -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ." - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "Projeksiyon \"{0}\" şu alanlar için tasarlandı\n" -#~ "enlem 46.1° ve 57° arası.\n" -#~ "Lütfen farklı bier projeksiyonu seçiniz\n" -#~ "eğer Fransız WMS kullanmıyorsanız.\n" -#~ "Bu mesajdan sonra herhangi bir şey yükleme." - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "Eklenti arşivi zaten mevcut. Yeni listeyi indirmek istiyormusunuz? eski " -#~ "liste silinecek!\n" -#~ "\n" -#~ "{0}" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Çeşişkiler: {0}" - -#~ msgid "viaduct" -#~ msgstr "viyadük" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir" +#~ msgid "Charge" +#~ msgstr "Para Değişim" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}." #~ msgid "Edit Drawbridge" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 16826) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 16827) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-14 18:01+0200\n" -"PO-Revision-Date: 2009-07-12 13:11+0000\n" +"POT-Creation-Date: 2009-08-04 11:43+0200\n" +"PO-Revision-Date: 2009-07-25 06:09+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,82 +16,162 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" +"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" -#: ../core/src/org/openstreetmap/josm/Main.java:192 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63 +#, java-format +msgid "" +"Failed to access system property ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 msgid "Creating main GUI" msgstr "建立主視窗中" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:202 +#: ../core/src/org/openstreetmap/josm/Main.java:196 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315 msgid "Help" msgstr "說明" -#: ../core/src/org/openstreetmap/josm/Main.java:281 +#: ../core/src/org/openstreetmap/josm/Main.java:289 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:394 +msgstr "無法使用投影法 {0}。改用麥卡托投影" + +#: ../core/src/org/openstreetmap/josm/Main.java:290 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47 +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261 +#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358 +msgid "Error" +msgstr "錯誤" + +#: ../core/src/org/openstreetmap/josm/Main.java:399 msgid "Hint: Some changes came from uploading new data to the server." msgstr "提示：部分變更來自上傳到伺服器的新資料。" -#: ../core/src/org/openstreetmap/josm/Main.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79 +#: ../core/src/org/openstreetmap/josm/Main.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279 msgid "Unsaved Changes" msgstr "未儲存的變更" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:401 msgid "There are unsaved changes. Discard the changes and continue?" msgstr "還有尚未儲存的變更。是否要放棄變更後繼續？" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Save and Exit" msgstr "存檔後離開" -#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:402 msgid "Discard and Exit" msgstr "放棄修改且離開" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/Main.java:402 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42 -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -100,32 +180,92 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Cancel" msgstr "取消" -#: ../core/src/org/openstreetmap/josm/Main.java:424 +#: ../core/src/org/openstreetmap/josm/Main.java:431 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正確的 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:437 +#: ../core/src/org/openstreetmap/josm/Main.java:432 +#: ../core/src/org/openstreetmap/josm/Main.java:450 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130 +msgid "Warning" +msgstr "警告" + +#: ../core/src/org/openstreetmap/josm/Main.java:449 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的檔案 URL： \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183 msgid "UNKNOWN" msgstr "不明" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "About" msgstr "關於" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122 msgid "Display the about screen." msgstr "顯示「關於」畫面。" @@ -133,10 +273,10 @@ #. TODO: put in a platformHook for system that have no console by default #. Add the name of this application -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75 -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67 msgid "Java OpenStreetMap Editor" @@ -144,5 +284,5 @@ #. Add the version number -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61 @@ -151,19 +291,19 @@ msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 #, java-format msgid "Last change at {0}" msgstr "上次改變於 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 #, java-format msgid "Java Version {0}" msgstr "上次修改 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 msgid "Homepage" msgstr "首頁" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145 msgid "Bug Reports" msgstr "程式臭蟲回報" @@ -173,37 +313,41 @@ #. #. -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27 #: build/trans_surveyor.java:64 msgid "Info" msgstr "資訊" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 msgid "Readme" msgstr "讀我檔案" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 msgid "Revision" msgstr "重訂版本" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151 msgid "Contribution" msgstr "貢獻者" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152 +msgid "License" +msgstr "授權" + +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222 msgid "Plugins" msgstr "外掛" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157 msgid "About JOSM..." msgstr "關於 JOSM" -#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194 msgid "File could not be found." msgstr "找不到檔案" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39 #, java-format msgid "" @@ -212,16 +356,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 msgid "Please select at least one already uploaded node, way, or relation." msgstr "請至少選擇一個已上傳的節點、路徑或關係。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 -msgid "Warning" -msgstr "警告" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74 #, java-format msgid "" @@ -230,7 +367,35 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#, fuzzy +msgid "Please select the target layer." +msgstr "請選擇要刪除的列。" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#, fuzzy +msgid "Select target layer" +msgstr "選擇其一：" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510 +#, fuzzy +msgid "Merge" +msgstr "合併節點" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 +#, java-format +msgid "" +"There are no layers the source layer
''{0}''
could be merged to." +"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +msgid "No target layers" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58 msgid "Add Node..." msgstr "新增節點" @@ -242,14 +407,16 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 #, java-format @@ -257,57 +424,57 @@ msgstr "編輯: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 msgid "Enter the coordinates for the new node." msgstr "輸入新節點的座標" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43 msgid "Use decimal degrees." msgstr "使用十進位度數" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44 msgid "Negative values denote Western/Southern hemisphere." msgstr "負數表示西半球/南半球" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83 msgid "Latitude" msgstr "緯度" -#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86 msgid "Longitude" msgstr "經度" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217 msgid "Align Nodes in Circle" msgstr "將節點排成圓" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36 msgid "Move the selected nodes into a circle." msgstr "將選取的節點移動到圓圈裡。" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47 @@ -323,25 +490,58 @@ msgstr "工具：{0}" -#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137 msgid "Please select at least four nodes." msgstr "請選取至少四個節點" +#. FIXME: not sure whether this fits in a dialog +#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51 +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115 +msgid "Information" +msgstr "資訊" + #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132 msgid "Align Nodes in Line" msgstr "對齊在直線裡的節點" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." msgstr "將選取的點排成直線" -#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64 msgid "Please select at least three nodes." msgstr "請至少選取三個節點" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53 #, java-format msgid "" @@ -350,18 +550,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109 msgid "API Capabilities Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 -msgid "Failed to initialize API. Please try again later." -msgstr "初始化 API 失敗。請稍後再試一次。" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 -msgid "API initialization failed" -msgstr "API 初始化失敗" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 +msgstr "違反 API 能力" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78 #, java-format msgid "" @@ -370,5 +562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87 #, java-format msgid "" @@ -377,46 +569,46 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90 msgid "Precondition Violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111 +msgstr "違反先決條件" + +#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104 #, java-format msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}" msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "data" msgstr "資料" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "layer" msgstr "圖層" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "selection" msgstr "選取" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62 msgid "conflict" msgstr "衝突" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28 msgid "download" msgstr "下載" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #, java-format msgid "Zoom to {0}" msgstr "縮放至 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 #, java-format msgid "Zoom the view to {0}." msgstr "將檢視縮放至 {0}。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16 @@ -426,30 +618,30 @@ msgstr "檢視：{0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "Nothing selected to zoom to." msgstr "沒有選擇要縮放的物件。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105 msgid "No conflicts to zoom to" msgstr "沒有要縮放的衝突" +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Combine Way" msgstr "合併路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52 msgid "Combine several ways into one." msgstr "合併多個路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 msgid "Please select at least two ways to combine." msgstr "請選擇至少兩個以上的路徑來合併" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120 msgid "Combine ways with different memberships?" msgstr "是否組合有不同關係成員的路徑？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121 msgid "" "The selected ways have differing relation memberships. Do you still want to " @@ -457,13 +649,13 @@ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123 msgid "Combine Anyway" msgstr "合併，不管怎樣" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152 msgid "Change directions?" msgstr "改變路徑方向?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -471,10 +663,10 @@ msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155 msgid "Reverse and Combine" msgstr "反轉後組合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302 @@ -482,20 +674,20 @@ msgstr "輸入所有衝突項目的數值。" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304 msgid "Solve Conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243 #, java-format msgid "Combine {0} ways" msgstr "組合 {0} 條路徑" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269 msgid "All the ways were empty" msgstr "所有的路徑都是空的" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -512,111 +704,147 @@ msgstr "複製選取的物件到剪貼簿" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140 msgid "Please select something to copy." msgstr "請選擇物件" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278 msgid "Create Circle" msgstr "建立圓形" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." msgstr "從三個選取的節點建立圓形。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201 -msgid "Those nodes are not in a circle." +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207 +#, fuzzy +msgid "Those nodes are not in a circle. Aborting." msgstr "那些節點不在一個圓上。" -#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271 msgid "" "Please select exactly two or three nodes or one way with exactly two or " "three nodes." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +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:261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91 msgid "Delete" msgstr "刪除" -#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15 msgid "Delete selected objects." msgstr "刪除選擇的物件" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39 msgid "Overwrite" msgstr "覆寫" -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50 -#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102 msgid "File exists. Overwrite?" msgstr "檔案已存在，要覆蓋嗎?" #. Do it! -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133 msgid "Distribute Nodes" msgstr "散佈節點" -#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." msgstr "依一條直線將選取的節點等距離散佈。" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 msgid "Download from OSM..." msgstr "從 OSM 下載" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 msgid "Download map data from the OSM server." msgstr "從 OSM 主機下載圖資" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #, java-format msgid "File: {0}" msgstr "檔案: {0}" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45 msgid "Download" msgstr "下載" -#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75 msgid "Please select at least one task to download" msgstr "請選擇至少一項要下載的工作" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download referrers from OSM..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41 +msgid "Download primitives referring to one of the selected primitives" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42 +msgid "Download referrers..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 +#, java-format +msgid "There were {0} conflicts during import." +msgstr "匯入時有 {0} 個衝突。" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129 +#, fuzzy +msgid "Conflicts during download" +msgstr "下載時發生錯誤" + +#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149 +#, java-format +msgid "({0}/{1}) Loading parents of primitive {2}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357 msgid "Duplicate" msgstr "重製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16 msgid "Duplicate selection by copy and immediate paste." msgstr "重製會複製選擇區域並立即貼上。" @@ -636,5 +864,5 @@ msgstr "離開程式" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44 msgid "" "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed " @@ -642,58 +870,73 @@ msgstr "注意：GPL 與 OSM 授權並不相容，請勿上傳 GPL 授權的軌跡。" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214 msgid "Export to GPX..." msgstr "匯出到 GPX..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213 msgid "Export the data to GPX file." msgstr "匯出資料到 GPX 檔案" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67 msgid "Nothing to export. Get some data first." msgstr "沒有東西可匯出。請先取得一些資料。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121 +#, java-format +msgid "paramenter ''{0}'' must not be null" +msgstr "參數「{0}」不能為空值(null)" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119 +#, java-format +msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." +msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。" + +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132 msgid "gps track description" msgstr "gps 軌跡描述" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138 msgid "Add author information" msgstr "加入作者資訊" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141 msgid "Real name" msgstr "本名" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145 msgid "E-Mail" msgstr "E-Mail" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149 msgid "Copyright (URL)" msgstr "授權 {URL}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153 msgid "Predefined" msgstr "預先定義的" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155 msgid "Copyright year" msgstr "版權年份" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170 msgid "Keywords" msgstr "設定鍵" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175 msgid "Export options" msgstr "匯出選項" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177 msgid "Export and Save" msgstr "匯出並存檔" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235 #, java-format msgid "" @@ -704,25 +947,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69 -#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352 -msgid "Error" -msgstr "錯誤" - -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295 msgid "Choose a predefined license" msgstr "選擇預先定義的授權" @@ -732,46 +955,49 @@ msgstr "JOSM 線上說明" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109 msgid "Open in Browser" msgstr "在瀏覽器中打開" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634 msgid "Edit" msgstr "編輯" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" msgstr "重新載入" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 msgid "Can only edit help pages from JOSM Online Help" msgstr "只能在 JOSM 線上求助中編輯求助頁面" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200 #, java-format msgid "Error while loading page {0}" msgstr "載入頁面 {0} 時發生錯誤" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219 #, java-format msgid "Help page missing. Create it in english." msgstr "求助頁面遺失。以 english 建立它。" -#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213 +#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224 #, java-format msgid "" @@ -809,30 +1035,40 @@ msgstr "將節點連結到最近的路徑區段" -#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70 msgid "Join Node and Line" msgstr "連結節點與直線" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 msgid "No Shortcut" msgstr "沒有捷徑鍵" +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge layer" +msgstr "圖層更名" + +#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18 +#, fuzzy +msgid "Merge the current layer into another layer" +msgstr "將下列圖層直接合併至選取的圖層。" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57 msgid "Merge Nodes" msgstr "合併節點" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Merge nodes into the oldest one." msgstr "將節點合併到最舊的一個中。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77 msgid "Please select at least two nodes to merge." msgstr "請至少選取兩個節點來合併" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158 msgid "Merge nodes with different memberships?" msgstr "是否合併有不同成員的節點？" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159 msgid "" "The selected nodes have differing relation memberships. Do you still want " @@ -840,68 +1076,79 @@ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161 msgid "Merge Anyway" msgstr "強制合併" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "不能合併節點。會刪除仍在使用的路徑。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295 #, java-format msgid "Merge {0} nodes" msgstr "合併 {0} 個節點" +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21 +#, fuzzy +msgid "Merge selection" +msgstr "選取" + +#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20 +#, fuzzy +msgid "Merge the currently selected primitives into another layer" +msgstr "將目前選取的成員下移" + +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76 msgid "Mirror" msgstr "鏡射" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 msgid "Mirror selected nodes and ways." msgstr "鏡射選取的節點和路徑。" -#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54 msgid "Please select at least one node or way." msgstr "請選擇至少一個節點或路徑。" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 msgid "up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47 #, java-format msgid "Move objects {0}" msgstr "移動物件 {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40 msgid "down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43 msgid "left" msgstr "左" #. dir == Direction.RIGHT) { -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46 msgid "right" msgstr "右" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 #, java-format msgid "Move {0}" msgstr "移動 {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57 #, java-format msgid "Moves Objects {0}" msgstr "移動物件 {0}" -#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251 msgid "Cannot move objects outside of the world." msgstr "不能將物件移動到世界外頭" @@ -909,5 +1156,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 msgid "New" msgstr "新增" @@ -917,26 +1164,17 @@ msgstr "建立新地圖" -#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22 -msgid "unnamed" -msgstr "未命名的" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32 msgid "Open..." msgstr "開啟..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31 msgid "Open a file." msgstr "開啟檔案" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54 -#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 -#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 -#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174 -#, java-format -msgid "Could not read \"{0}\"" -msgstr "不能讀取 \"{0}\"" +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59 +#, java-format +msgid "Could not read file ''{0}''. Error is:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32 @@ -965,43 +1203,44 @@ msgstr "下載 URL" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39 -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 msgid "Orthogonalize Shape" msgstr "形狀直角化" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42 msgid "Move nodes so all angles are 90 or 270 degree" msgstr "移動節點讓所有角度成為 90 或 270 度" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62 msgid "Only two nodes allowed" msgstr "只允許兩個節點" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75 msgid "Selection must consist only of ways." msgstr "選擇區域只能由路徑組成。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87 msgid "Please select one or more closed ways of at least four nodes." msgstr "請選擇一或多個至少有四個節點的封閉路徑。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109 msgid "Please select ways with almost right angles to orthogonalize." msgstr "請選擇有近乎正確角度的路徑來做直角化。" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119 +#, fuzzy msgid "" "You are using the EPSG:4326 projection which might lead
to " "undesirable results when doing rectangular alignments.
Change your " -"projection to get rid of this warning.
Do you want to continue?" +"projection to get rid of this warning.
Do you want to continue?" msgstr "" "您所使用的 EPSG:4326 投影法在進行矩形對齊時
可能會造成不想要的結果。" "
請改變您的投影法以避開這個警告。
是否要繼續？" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137 msgid "Only one node selected" msgstr "只選取一個節點" -#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283 msgid "Orthogonalize" msgstr "直角化" @@ -1017,11 +1256,11 @@ msgstr "從剪貼緩衝區貼上內容。" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78 msgid "Paste Tags" msgstr "貼上標籤" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "將剪貼緩衝區的標籤套用到所有選取的項目上。" @@ -1049,16 +1288,21 @@ msgstr "重做上次復原的動作。" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65 msgid "Rename layer" msgstr "圖層更名" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" msgstr "同時重新命名該檔案" -#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87 -#, java-format -msgid "Could not rename the file \"{0}\"." +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70 +#, java-format +msgid "Warning: failed to put a dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99 +#, fuzzy, java-format +msgid "Could not rename file ''{0}''" msgstr "無法重新命名檔案 \"{0}\"。" @@ -1072,9 +1316,9 @@ msgstr "反轉所有選取路徑的方向。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50 msgid "Please select at least one way." msgstr "請選擇至少一條路徑。" -#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80 msgid "Reverse ways" msgstr "反轉路徑" @@ -1082,17 +1326,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183 msgid "Save" msgstr "存檔" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182 msgid "Save the current data." msgstr "儲存現在的資料" -#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38 #, java-format msgid "File {0} exists. Overwrite?" msgstr "檔案 {0} 已存在。是否覆蓋？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91 msgid "" "Internal Error: cannot check conditions for no layer. Please report this as " @@ -1100,25 +1346,25 @@ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 msgid "No document open so nothing to save." msgstr "尚未開啟文件故沒有可儲存的項目。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Empty document" msgstr "空的文件" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "The document contains no data." msgstr "文件沒有包含資料。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107 msgid "Save anyway" msgstr "強制儲存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 msgid "Conflicts" msgstr "衝突" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -1126,54 +1372,75 @@ msgstr "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117 msgid "Reject Conflicts and Save" msgstr "拒絕衝突項目並儲存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Save OSM file" msgstr "儲存 OSM 檔案" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "Save GPX file" msgstr "儲存 GPX 檔案" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131 msgid "Save Layer" msgstr "儲存圖層" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 -msgid "Could not back up file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#, fuzzy, java-format +msgid "Could not back up file. Exception is: {0}" msgstr "無法備份檔案。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212 +#, fuzzy, java-format +msgid "Unknown file extension for file ''{0}''" +msgstr "不明的延伸檔名：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223 +#, fuzzy, java-format +msgid "An error occurred while saving.
Error is:
{0}" +msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" +msgstr "在還原備份檔案時發生錯誤。" + +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270 msgid "Unknown file extension." msgstr "不明的延伸檔名。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238 -msgid "An error occurred while saving." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280 +#, fuzzy, java-format +msgid "An error occurred while saving. Error is: {0}" msgstr "存檔時發生錯誤" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248 -msgid "An error occurred while restoring backup file." +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295 +#, fuzzy, java-format +msgid "" +"An error occurred while restoring backup file.
Error is:
{0}" msgstr "在還原備份檔案時發生錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199 msgid "Save As..." msgstr "另存檔案..." -#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198 msgid "Save the current data to a new file." msgstr "將目前的資料儲存為新的檔案。" +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 msgid "Select All" msgstr "全選" -#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14 msgid "" "Select all undeleted objects in the data layer. This selects incomplete " @@ -1204,16 +1471,16 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Close" msgstr "關閉" +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55 msgid "Split Way" msgstr "切割路徑" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53 msgid "Split a way at the selected node." msgstr "在選取的節點上切割路徑" @@ -1223,10 +1490,10 @@ msgstr "不能在選取的節點上切割路徑" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126 msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." msgstr[0] "選取的節點不在任何路徑上" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 msgid "" "There is more than one way using the node you selected. Please select the " @@ -1237,19 +1504,19 @@ msgstr[0] "節點上不只有兩個路徑。請同時選取你想切割的路徑。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 msgid "The selected nodes do not share the same way." msgstr "選取的節點不在同一個路徑上。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." msgstr[0] "選取的路徑未包含選取的節點。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219 -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252 msgid "You must select two or more nodes to split a circular way." msgstr "你必須選擇兩個以上的節點來切割一個環狀路徑" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258 msgid "" "The way cannot be split at the selected nodes. (Hint: Select nodes in the " @@ -1257,19 +1524,21 @@ msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350 +#, fuzzy msgid "" -"A role based relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A role based relation membership was copied to all new ways.
You " +"should verify this and correct it when necessary." msgstr "以角色為基礎的關係成員已複製到所有新的路徑。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356 +#, fuzzy msgid "" -"A relation membership was copied to all new ways.\n" -"You should verify this and correct it when necessary." +"A relation membership was copied to all new ways.
You should verify " +"this and correct it when necessary." msgstr "" "關係成員已複製到所有的新路徑。\n" "您應該進行檢驗並在必要時修正它。" -#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362 #, java-format msgid "Split way {0} into {1} parts" @@ -1290,56 +1559,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:51 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52 msgid "Duplicate nodes that are used by multiple ways." msgstr "重製由多條路徑使用的節點。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83 msgid "This node is not glued to anything else." msgstr "這個節點並未黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108 msgid "None of these nodes are glued to anything else." msgstr "這些節點沒有一個黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 msgid "None of this way's nodes are glued to anything else." msgstr "這個路徑的節點沒有一個黏合到其他項目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "The current selection cannot be used for unglueing." msgstr "目前的選擇區域不能用於取消黏合。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "Select either:" msgstr "選擇其一：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "* One tagged node, or" msgstr "* 一個有標籤的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123 msgid "* One node that is used by more than one way, or" msgstr "* 一個用於多條路徑的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 一個用於多條路徑或用於那些路徑之一的節點，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* 一個有一或更多節點用於多條路徑的路徑，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* 一個路徑且其一或多個節點用於多條路徑。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -1352,9 +1621,9 @@ "都會被選取。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171 msgid "Unglued Node" msgstr "取消黏合節點" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388 #, java-format msgid "Dupe into {0} nodes" @@ -1362,5 +1631,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1376,139 +1645,90 @@ msgstr "復原最後的動作。" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37 msgid "Unselect All" msgstr "取消全選" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 msgid "Unselect all objects." msgstr "取消選擇所有的物件。" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24 msgid "Unselect All (Focus)" msgstr "取消全選（焦點）" -#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35 msgid "Unselect All (Escape)" msgstr "取消全選（跳出）" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 msgid "Update Data" msgstr "更新資料" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23 +#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21 msgid "Updates the current data layer from the server (re-downloads data)" msgstr "從伺服器更新目前的資料圖層（重新下載資料）" -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64 -msgid "" -"No data to update found. Have you already opened or downloaded a data layer?" -msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 -msgid "No data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 -msgid "Failed to update the selected primitives." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62 -msgid "Update failed" -msgstr "更新失敗" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76 -#, java-format -msgid "Could not find primitive with id {0} in the current dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77 -msgid "Missing primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185 -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78 +#, fuzzy +msgid "No current dataset found" +msgstr "找不到 GPX 資料圖層。" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 +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 msgid "Update Selection" msgstr "更新選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 msgid "Selection empty" msgstr "選擇區域是空的" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload to OSM..." msgstr "上傳至 OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 msgid "Upload all changes to the OSM server." msgstr "將所有的變更上傳至 OSM 伺服器。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100 -msgid "Objects to add:" -msgstr "要加入的物件：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 -msgid "Objects to modify:" -msgstr "要編輯的物件：" - #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 -msgid "Objects to delete:" -msgstr "要刪除的物件：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123 -msgid "Provide a brief comment for the changes you are uploading:" -msgstr "提供關於您所上傳變更的簡短註解：" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132 -msgid "Upload these changes?" -msgstr "是否上傳這些變更？" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 -msgid "Upload Changes" -msgstr "上傳變更" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158 msgid "Nothing to upload. Get some data first." msgstr "沒有要上傳的項目。請先取得一些資料。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "尚有未解決的衝突。您必須先解決那些衝突。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 msgid "No changes to upload." msgstr "沒有要上傳的變更。" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210 -msgid "Uploading" -msgstr "正在上傳" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261 -msgid "Updating primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317 #, java-format msgid "Synchronize {0} {1} only" msgstr "只同步 {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 msgid "Synchronize entire dataset" msgstr "同步整個資料組" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215 #, java-format msgid "" @@ -1522,17 +1742,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 msgid "Conflict detected" msgstr "偵測到衝突" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281 #, java-format msgid "unexpected return value. Got {0}" msgstr "未預期的回傳值。得到 {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258 #, java-format msgid "" @@ -1546,56 +1766,65 @@ "{1}則會放棄並繼續編輯。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 -#, java-format -msgid "" -"Uploading to the server failed because your " -"current
dataset violates a precondition.
The error message is:
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 -msgid "Precondition violation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459 -#, java-format -msgid "" -"Uploading failed because a primitive you tried " -"to
delete on the server is already deleted.

The error message is:" -"
{0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 -msgid "Primitive already deleted" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 #, java-format msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389 msgid "Upload to OSM API failed" msgstr "上傳至 OSM API 失敗" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575 -#, java-format +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +msgid "Updating primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449 +#, fuzzy +msgid "upload all changes in one request" +msgstr "將所有的變更上傳至 OSM 伺服器。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450 msgid "" -"Failed to initialize communication with the OSM server {0}.\n" -"Check the server URL in your preferences and your internet connection." -msgstr "" -"初始化與 OSM 伺服器 {0} 的連線失敗。\n" -"請檢查您的偏好設定中的伺服器 URL 和網際網路連線。" +"Enable to upload all changes in one request, disable to use one request per " +"changed primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464 +msgid "Objects to add:" +msgstr "要加入的物件：" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472 +msgid "Objects to modify:" +msgstr "要編輯的物件：" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480 +msgid "Objects to delete:" +msgstr "要刪除的物件：" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487 +msgid "Provide a brief comment for the changes you are uploading:" +msgstr "提供關於您所上傳變更的簡短註解：" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499 +msgid "Upload these changes?" +msgstr "是否上傳這些變更？" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501 +msgid "Upload Changes" +msgstr "上傳變更" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531 +msgid "Uploading" +msgstr "正在上傳" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1683,42 +1912,54 @@ msgstr "慢速快轉" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 msgid "Downloading GPS data" msgstr "正在下載 GPS 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 msgid "Downloaded GPX Data" msgstr "已下載的 GPX 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 msgid "Raw GPS data" msgstr "原始 GPS 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54 msgid "Downloading data" msgstr "正在下載資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64 +#, java-format +msgid "" +"Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116 msgid "No data imported." msgstr "沒有匯入資料。" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147 msgid "OpenStreetMap data" msgstr "OpenStreetMap 資料" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60 #, java-format msgid "Download {0} of {1} ({2} left)" msgstr "下載 {0} / {1} (剩下 {2})" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93 -msgid "The following errors occurred during mass download:" +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78 +#, fuzzy +msgid "Updating data" +msgstr "更新資料" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109 +#, fuzzy, java-format +msgid "The following errors occurred during mass download:{0}" msgstr "在大量下載時發生下列錯誤：" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111 msgid "Errors during Download" msgstr "下載時發生錯誤" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "" @@ -1730,21 +1971,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189 msgid "Deleted or moved primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 msgid "Delete Mode" msgstr "刪除模式" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49 msgid "Delete nodes or ways." msgstr "刪除節點或路徑。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -1752,5 +1993,5 @@ msgstr "模式：{0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -1760,751 +2001,23 @@ "Ctrl：刪除參考的物件。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Draw" -msgstr "繪製" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 -msgid "Draw nodes" -msgstr "繪製節點" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96 -msgid "Mode: Draw Focus" -msgstr "模式：繪製焦點" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 -msgid "selected" -msgstr "已選取" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336 -msgid "Cannot add a node outside of the world." -msgstr "不能在這個世界以外的地方加入節點。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493 -msgid "Add node" -msgstr "加入節點" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495 -msgid "Add node into way" -msgstr "將節點加入路徑" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500 -msgid "Connect existing way to node" -msgstr "將既存的路徑連接到節點" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502 -msgid "Add a new node to an existing way" -msgstr "在既存的路徑加入新的節點" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504 -msgid "Add node into way and connect" -msgstr "將節點加入路徑並連接" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881 -msgid "Create new node." -msgstr "建立新的節點。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908 -msgid "Select node under cursor." -msgstr "選取游標下的節點。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888 -#, java-format -msgid "Insert new node into way." -msgid_plural "Insert new node into {0} ways." -msgstr[0] "插入新的節點到{0} 路徑中。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897 -msgid "Start new way from last node." -msgstr "從最後的節點開始新的路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899 -msgid "Continue way from last node." -msgstr "從最後的節點繼續路徑。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920 -msgid "Finish drawing." -msgstr "結束繪製。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 -msgid "Extrude" -msgstr "推出" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 -msgid "Create areas" -msgstr "建立區域" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248 -msgid "Extrude Way" -msgstr "推出路徑" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520 -msgid "Release the mouse button to select the objects in the rectangle." -msgstr "放開滑鼠按鈕以選擇矩形內的物件。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263 -msgid "Draw a rectangle of the desired size, then release the mouse button." -msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 -msgid "Release the mouse button to stop rotating." -msgstr "放開滑鼠按鈕以停止旋轉。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267 -msgid "Drag a way segment to make a rectangle." -msgstr "拖曳路徑區段以產生矩形。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 -msgid "" -"Drag play head and release near track to play audio from there; SHIFT" -"+release to synchronize audio at that point." -msgstr "" -"將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96 -msgid "Select" -msgstr "選擇" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97 -msgid "Select, move and rotate objects" -msgstr "選擇、移動和旋轉物件" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198 -#, java-format -msgid "Add and move a virtual new node to way" -msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "加入並移動虛擬新節點至{0}路徑" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 -msgid "Move elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 -#, java-format -msgid "" -"You did move more than {0} elements. Moving a large number of elements is " -"often an error.\n" -"Really move them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Move them" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 -msgid "Undo move" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 -msgid "" -"Release the mouse button to stop moving. Ctrl to merge with nearest node." -msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526 -msgid "" -"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" -"Ctrl to rotate selected; or change selection" -msgstr "" -"以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；" -"或改變選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49 -msgid "Zoom" -msgstr "縮放" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -msgid "Zoom and move map" -msgstr "縮紋並移動地圖" - -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 -msgid "" -"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " -"move zoom with right button" -msgstr "" -"拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移" -"動縮放" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45 -msgid "Search..." -msgstr "搜尋..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search for objects." -msgstr "搜尋物件。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 -#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66 -msgid "No data loaded." -msgstr "沒有載入資料。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57 -msgid "Please enter a search string." -msgstr "請輸入搜尋字串。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61 -msgid "replace selection" -msgstr "取代選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62 -msgid "add to selection" -msgstr "加入至選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63 -msgid "remove from selection" -msgstr "從選擇區域移除" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 -msgid "case sensitive" -msgstr "區分大小寫" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 -msgid "regular expression" -msgstr "正規表示式" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "Baker Street - 「Baker」和「Street」出現在何設定鍵或名稱中。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "\"Baker Street\" - 「Baker Street」出現在何設定鍵或名稱中。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86 -msgid "name:Bak - 'Bak' anywhere in the name." -msgstr "name:Bak - 「Bak」出現在名稱中的任何地方。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 -msgid "type=route - key 'type' with value exactly 'route'." -msgstr "type=route - 含有設定鍵「type」為「route」者。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 -msgid "" -"type=* - key 'type' with any value. Try also *=value, " -"type=, *=*, *=" -msgstr "" -"type=* - 設定鍵「type」為任何數值。也可以使用 *=value、" -"type=、*=*、*=" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 -msgid "-name:Bak - not 'Bak' in the name." -msgstr "-name:Bak - 名稱中沒有「Bak」。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 -msgid "foot: - key=foot set to any value." -msgstr "foot: - key=foot 設定為任何數值。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 -msgid "Special targets:" -msgstr "特殊的目標：" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"類型： - 物件的類型 (節點(node), 路徑(way), 關係" -"(relation))" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 -msgid "user:... - all objects changed by user" -msgstr "使用者：... - 所有由某使用者改變的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 -msgid "id:... - object with given ID" -msgstr "id：... - 具有此 ID 的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 -msgid "nodes:... - object with given number of nodes" -msgstr "節點數：... - 含有此數目節點的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 -msgid "modified - all changed objects" -msgstr "修改過 - 所有改變過的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 -msgid "selected - all selected objects" -msgstr "選取的 - 所有選取的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 -msgid "incomplete - all incomplete objects" -msgstr "不完整 - 所有不完整的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 -msgid "untagged - all untagged objects" -msgstr "未標籤的 - 所有未標籤的物件" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 -msgid "" -"child expr - all children of objects matching the expression" -msgstr "child expr - 所有物件的子項符合正規表示式的" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 -msgid "" -"parent expr - all parents of objects matching the expression" -msgstr "parent expr - 所有物件父項符合正規表示式的" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 -msgid "Use | or OR to combine with logical or" -msgstr "使用 | 或 OR 做邏輯或運算" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 -msgid "Use \" to quote operators (e.g. if key contains :)" -msgstr "使用 \" 將運算子包覆 (例如當設定鍵含有 :)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 -msgid "Use ( and ) to group expressions" -msgstr "使用 ( 和 ) 將正規表示式群組起來" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141 -msgid "Search" -msgstr "搜尋" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 -msgid "Start Search" -msgstr "開始搜尋" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 -#, java-format -msgid "No match found for ''{0}''" -msgstr "找不到「{0}」的符合項" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 -#, java-format -msgid "Nothing added to selection by searching for ''{0}''" -msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 -#, java-format -msgid "Nothing removed from selection by searching for ''{0}''" -msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 -#, java-format -msgid "Found {0} matches" -msgstr "找到 {0} 個符合項" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CS" -msgstr "CS" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 -msgid "CI" -msgstr "CI" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 -msgid "RX" -msgstr "RX" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 -#, java-format -msgid "" -"The regex \"{0}\" had a parse error at offset {1}, full error:\n" -"\n" -"{2}" -msgstr "" -"正規表示式「{0}」在 {1} 處解析錯誤，完整的錯誤訊息：\n" -"\n" -"{2}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172 -msgid "Key cannot be empty when tag operator is used. Sample use: key=value" -msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 -#, java-format -msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 -#, java-format -msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 -#, java-format -msgid "Unexpected token: {0}" -msgstr "未預期的記號：{0}" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 -msgid "Missing arguments for or." -msgstr "沒有 or 所需的引數。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 -msgid "Missing argument for not." -msgstr "沒有 not 所需的引數。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 -msgid "Expected closing parenthesis." -msgstr "需要關閉括弧。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 -msgid "Wrong number of parameters for nodes operator." -msgstr "給 nodes 運算子錯誤的參數數量。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 -#, java-format -msgid "" -"Incorrect value of nodes operator: {0}. Nodes operator expects number of " -"nodes or range, for example nodes:10-20" -msgstr "" -"nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 " -"nodes:10-20" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "id 運算子數值錯誤：{0}。應使用數字。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34 -msgid "Load Selection" -msgstr "載入選擇區域" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41 -#, java-format -msgid "Contact {0}..." -msgstr "連接 {0}..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 -msgid "Downloading..." -msgstr "正在下載..." - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67 -#, java-format -msgid "Could not read from URL: \"{0}\"" -msgstr "無法讀取 URL：「{0}」" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62 -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70 -#, java-format -msgid "Parsing error in URL: \"{0}\"" -msgstr "URL 解析錯誤：「{0}」" - -#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74 -msgid "Error while communicating with server." -msgstr "與伺服器連線時發生錯誤。" - -#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57 -#, java-format -msgid "Add {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 -#, java-format -msgid "Change {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 -#, java-format -msgid "Remove \"{0}\" for {1} ''{2}''" -msgstr "從 {1} 「{2}」移除「{0}」" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100 -#, java-format -msgid "Set {0}={1} for {2} ''{3}''" -msgstr "將 {2}「{3}」設定 {0}={1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66 -msgid "object" -msgid_plural "objects" -msgstr[0] "物件" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105 -#, java-format -msgid "Remove \"{0}\" for {1} {2}" -msgstr "從 {1} {2} 移除「{0}」" - -#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106 -#, java-format -msgid "Set {0}={1} for {2} {3}" -msgstr "將 {2} {3} 設定 {0}={1}" - -#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68 -#, java-format -msgid "Change relation member role for {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 -msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in coordinates in {0}" -msgstr "解決坐標 {0} 裡的衝突" - -#. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 -msgid "cannot resolve undecided conflict" -msgstr "不能未決定的衝突" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82 -#, java-format -msgid "Delete {1} {0}" -msgstr "刪除 {1} {0}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98 -#, java-format -msgid "Delete {0} {1}" -msgstr "刪除 {0} {1}" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154 -msgid "Conflicting relation" -msgstr "衝突的關係" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" -"Delete from relation?" -msgstr "" -"選擇區域「{0}」已用於關係「{1}」的角色 {2}。\n" -"是否自關係中刪除？" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -msgid "Delete from relation" -msgstr "自關係中刪除" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 -#, java-format -msgid "" -"Selection \"{0}\" is used by relation \"{1}\".\n" -"Delete from relation?" -msgstr "" -"選擇區域「{0}」已用於關係「{1}」。\n" -"是否自關係中刪除？" - -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359 -msgid "Split way segment" -msgstr "分割路徑區段" - -#. leave message in one tr() as there is a grammatical connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378 -msgid "" -"You are about to delete nodes outside of the area you have downloaded." -"
This can cause problems because other objects (that you don't see) might " -"use them.
Do you really want to delete?" -msgstr "" -"您將要刪除在下載的區域外的節點。
這樣有時會發生問題，因為其他物件（您沒有" -"看到的）可能會使用它們。
確定要刪除嗎？" - -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 -#, java-format -msgid "Resolve conflicts in deleted state in {0}" -msgstr "解決 {0} 刪除狀態的衝突" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -msgid "Move" -msgstr "移動" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 -msgid "node" -msgid_plural "nodes" -msgstr[0] "節點" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194 -#, java-format -msgid "" -"Warning: Purging way {0} because number of nodes dropped below 2. Current is " -"{1}" -msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 -#, java-format -msgid "Resolve conflicts in member list of relation {0}" -msgstr "解決關係 {0} 的成員清單的衝突" - -#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, java-format -msgid "Remove relation member {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 -#, java-format -msgid "Rotate {0} {1}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 -msgid "Sequence" -msgstr "次序" - -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 -#, java-format -msgid "Resolve {0} tag conflicts in {1} {2}" -msgstr "解決 {1} {2} 中的 {0} 標籤衝突" - -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 -#, 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 "解決 {0} {1} 的版本衝突" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 -#, java-format -msgid "Resolve conflicts in node list of of way {0}" -msgstr "解決路徑 {0} 的節點清單衝突" - -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 -#, java-format -msgid "Main dataset does not include node {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 -msgid "Apply?" -msgstr "是否接受？" - -#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 -msgid "" -"When reversing this way, the following changes to properties of the way and " -"its nodes are suggested in order to maintain data consistency." -msgstr "" -"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變" -"更。" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 -msgid "Relation" -msgstr "關係" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 -msgid "Old role" -msgstr "舊的角色" - -#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32 -msgid "New role" -msgstr "新的角色" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 -msgid "Old key" -msgstr "舊的設定鍵" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 -msgid "Old value" -msgstr "舊的數值" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 -msgid "New key" -msgstr "新的設定鍵" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -msgid "New value" -msgstr "新的數值" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40 -msgid "Apply selected changes" -msgstr "套用選取的變更" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41 -msgid "Don't apply changes" -msgstr "不要套用變更" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83 -msgid "Please select which property changes you want to apply." -msgstr "請選擇要接受的屬性變更。" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96 -msgid "Properties of " -msgstr "屬性 " - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120 -msgid "Roles in relations referring to" -msgstr "關係中的角色參照到" - -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136 -msgid "Automatic tag correction" -msgstr "自動修正標籤" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314 -#, java-format -msgid "Malformed config file at lines {0}" -msgstr "設定檔案第 {0} 行格式不良" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 -#, java-format -msgid "Cannot open preferences directory: {0}" -msgstr "不能開啓偏好設定目錄：{0}" - -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342 -#, java-format -msgid "Preferences file had errors. Making backup of old one to {0}." -msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79 -#, java-format -msgid "Preferences stored on {0}" -msgstr "偏好設定儲存於 {0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82 -#, java-format -msgid "Could not upload preferences. Reason: {0}" -msgstr "無法上傳偏好設定。理由：{0}" - -#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 -msgid "Could not load preferences from server." -msgstr "無法從伺服器載入偏好設定。" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 -#, java-format -msgid "already registered a conflict for primitive ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160 +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153 @@ -2516,8 +2029,789 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342 #, java-format msgid "parameter ''{0}'' must not be null" msgstr "參數「{0}」必須不為空值(null)" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Draw" +msgstr "繪製" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94 +msgid "Draw nodes" +msgstr "繪製節點" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100 +msgid "Mode: Draw Focus" +msgstr "模式：繪製焦點" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 +msgid "selected" +msgstr "已選取" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356 +msgid "Cannot add a node outside of the world." +msgstr "不能在這個世界以外的地方加入節點。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528 +msgid "Add node" +msgstr "加入節點" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530 +msgid "Add node into way" +msgstr "將節點加入路徑" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538 +msgid "Connect existing way to node" +msgstr "將既存的路徑連接到節點" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540 +msgid "Add a new node to an existing way" +msgstr "在既存的路徑加入新的節點" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542 +msgid "Add node into way and connect" +msgstr "將節點加入路徑並連接" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928 +msgid "Create new node." +msgstr "建立新的節點。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957 +msgid "Select node under cursor." +msgstr "選取游標下的節點。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935 +#, java-format +msgid "Insert new node into way." +msgid_plural "Insert new node into {0} ways." +msgstr[0] "插入新的節點到{0} 路徑中。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945 +msgid "Start new way from last node." +msgstr "從最後的節點開始新的路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947 +msgid "Continue way from last node." +msgstr "從最後的節點繼續路徑。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970 +msgid "Finish drawing." +msgstr "結束繪製。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78 +msgid "Extrude" +msgstr "推出" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77 +msgid "Create areas" +msgstr "建立區域" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 +msgid "Extrude Way" +msgstr "推出路徑" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538 +msgid "Release the mouse button to select the objects in the rectangle." +msgstr "放開滑鼠按鈕以選擇矩形內的物件。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266 +msgid "Draw a rectangle of the desired size, then release the mouse button." +msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542 +msgid "Release the mouse button to stop rotating." +msgstr "放開滑鼠按鈕以停止旋轉。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270 +msgid "Drag a way segment to make a rectangle." +msgstr "拖曳路徑區段以產生矩形。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 +msgid "" +"Drag play head and release near track to play audio from there; SHIFT" +"+release to synchronize audio at that point." +msgstr "" +"將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +msgid "Select" +msgstr "選擇" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111 +msgid "Select, move and rotate objects" +msgstr "選擇、移動和旋轉物件" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212 +#, java-format +msgid "Add and move a virtual new node to way" +msgid_plural "Add and move a virtual new node to {0} ways" +msgstr[0] "加入並移動虛擬新節點至{0}路徑" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465 +msgid "Move elements" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466 +#, java-format +msgid "" +"You did move more than {0} elements. Moving a large number of elements is " +"often an error.\n" +"Really move them?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Move them" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469 +msgid "Undo move" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540 +msgid "" +"Release the mouse button to stop moving. Ctrl to merge with nearest node." +msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544 +msgid "" +"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" +"Ctrl to rotate selected; or change selection" +msgstr "" +"以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取的；" +"或改變選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +msgid "Zoom" +msgstr "縮放" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +msgid "Zoom and move map" +msgstr "縮紋並移動地圖" + +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +msgid "" +"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " +"move zoom with right button" +msgstr "" +"拖曳或 Ctrl+. 或 Ctrl+, 來縮放；Ctrl+up, left, down, right 可移動；按右鍵可移" +"動縮放" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46 +msgid "Search..." +msgstr "搜尋..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search for objects." +msgstr "搜尋物件。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 +msgid "Can't search because there is no loaded data." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66 +msgid "Please enter a search string." +msgstr "請輸入搜尋字串。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70 +msgid "replace selection" +msgstr "取代選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +msgid "add to selection" +msgstr "加入至選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +msgid "remove from selection" +msgstr "從選擇區域移除" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +msgid "case sensitive" +msgstr "區分大小寫" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79 +msgid "regular expression" +msgstr "正規表示式" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "Baker Street - 「Baker」和「Street」出現在何設定鍵或名稱中。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "\"Baker Street\" - 「Baker Street」出現在何設定鍵或名稱中。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95 +msgid "name:Bak - 'Bak' anywhere in the name." +msgstr "name:Bak - 「Bak」出現在名稱中的任何地方。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96 +msgid "type=route - key 'type' with value exactly 'route'." +msgstr "type=route - 含有設定鍵「type」為「route」者。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +msgid "" +"type=* - key 'type' with any value. Try also *=value, " +"type=, *=*, *=" +msgstr "" +"type=* - 設定鍵「type」為任何數值。也可以使用 *=value、" +"type=、*=*、*=" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +msgid "-name:Bak - not 'Bak' in the name." +msgstr "-name:Bak - 名稱中沒有「Bak」。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +msgid "foot: - key=foot set to any value." +msgstr "foot: - key=foot 設定為任何數值。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +msgid "Special targets:" +msgstr "特殊的目標：" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"類型： - 物件的類型 (節點(node), 路徑(way), 關係" +"(relation))" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +msgid "user:... - all objects changed by user" +msgstr "使用者：... - 所有由某使用者改變的物件" + +#: ../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 +msgid "modified - all changed objects" +msgstr "修改過 - 所有改變過的物件" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +msgid "selected - all selected objects" +msgstr "選取的 - 所有選取的物件" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +msgid "incomplete - all incomplete objects" +msgstr "不完整 - 所有不完整的物件" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +msgid "untagged - all untagged objects" +msgstr "未標籤的 - 所有未標籤的物件" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +msgid "" +"child expr - all children of objects matching the expression" +msgstr "child expr - 所有物件的子項符合正規表示式的" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +msgid "" +"parent expr - all parents of objects matching the expression" +msgstr "parent expr - 所有物件父項符合正規表示式的" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgid "Use | or OR to combine with logical or" +msgstr "使用 | 或 OR 做邏輯或運算" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +msgid "Use \" to quote operators (e.g. if key contains :)" +msgstr "使用 \" 將運算子包覆 (例如當設定鍵含有 :)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgid "Use ( and ) to group expressions" +msgstr "使用 ( 和 ) 將正規表示式群組起來" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 +msgid "Search" +msgstr "搜尋" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 +msgid "Start Search" +msgstr "開始搜尋" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#, java-format +msgid "No match found for ''{0}''" +msgstr "找不到「{0}」的符合項" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#, java-format +msgid "Nothing added to selection by searching for ''{0}''" +msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#, java-format +msgid "Nothing removed from selection by searching for ''{0}''" +msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#, java-format +msgid "Found {0} matches" +msgstr "找到 {0} 個符合項" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CS" +msgstr "CS" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234 +msgid "CI" +msgstr "CI" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235 +msgid "RX" +msgstr "RX" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32 +#, java-format +msgid "" +"The regex \"{0}\" had a parse error at offset {1}, full error:\n" +"\n" +"{2}" +msgstr "" +"正規表示式「{0}」在 {1} 處解析錯誤，完整的錯誤訊息：\n" +"\n" +"{2}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173 +msgid "Key cannot be empty when tag operator is used. Sample use: key=value" +msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#, java-format +msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496 +#, java-format +msgid "Unexpected token: {0}" +msgstr "未預期的記號：{0}" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516 +msgid "Missing arguments for or." +msgstr "沒有 or 所需的引數。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526 +msgid "Missing argument for not." +msgstr "沒有 not 所需的引數。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +msgid "Expected closing parenthesis." +msgstr "需要關閉括弧。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598 +msgid "Wrong number of parameters for nodes operator." +msgstr "給 nodes 運算子錯誤的參數數量。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600 +#, java-format +msgid "" +"Incorrect value of nodes operator: {0}. Nodes operator expects number of " +"nodes or range, for example nodes:10-20" +msgstr "" +"nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 " +"nodes:10-20" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607 +#, java-format +msgid "Incorrect value of id operator: {0}. Number is expected." +msgstr "id 運算子數值錯誤：{0}。應使用數字。" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35 +msgid "Load Selection" +msgstr "載入選擇區域" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46 +#, java-format +msgid "Contact {0}..." +msgstr "連接 {0}..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48 +msgid "Downloading..." +msgstr "正在下載..." + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81 +#, java-format +msgid "Could not read from URL: \"{0}\"" +msgstr "無法讀取 URL：「{0}」" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 +#, java-format +msgid "Parsing error in URL: \"{0}\"" +msgstr "URL 解析錯誤：「{0}」" + +#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 +msgid "Error while communicating with server." +msgstr "與伺服器連線時發生錯誤。" + +#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 +#, java-format +msgid "Add {0} {1}" +msgstr "" + +#: ../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 "從 {1} 「{2}」移除「{0}」" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 +#, java-format +msgid "Set {0}={1} for {2} ''{3}''" +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 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65 +msgid "object" +msgid_plural "objects" +msgstr[0] "物件" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114 +#, java-format +msgid "Remove \"{0}\" for {1} {2}" +msgstr "從 {1} {2} 移除「{0}」" + +#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115 +#, java-format +msgid "Set {0}={1} for {2} {3}" +msgstr "將 {2} {3} 設定 {0}={1}" + +#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70 +#, java-format +msgid "Change relation member role for {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"conflict can't be added." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 +#, fuzzy +msgid "Double conflict" +msgstr "解決衝突" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56 +#, java-format +msgid "" +"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " +"primitmive ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72 +#, fuzzy, java-format +msgid "Add conflict for ''{0}''" +msgstr "找不到「{0}」的符合項" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 +msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in coordinates in {0}" +msgstr "解決坐標 {0} 裡的衝突" + +#. should not happen +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +msgid "cannot resolve undecided conflict" +msgstr "不能未決定的衝突" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109 +#, java-format +msgid "Delete {1} {0}" +msgstr "刪除 {1} {0}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128 +#, java-format +msgid "Delete {0} {1}" +msgstr "刪除 {0} {1}" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 +msgid "Conflicting relation" +msgstr "衝突的關係" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n" +"Delete from relation?" +msgstr "" +"選擇區域「{0}」已用於關係「{1}」的角色 {2}。\n" +"是否自關係中刪除？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +msgid "Delete from relation" +msgstr "自關係中刪除" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179 +#, java-format +msgid "" +"Selection \"{0}\" is used by relation \"{1}\".\n" +"Delete from relation?" +msgstr "" +"選擇區域「{0}」已用於關係「{1}」。\n" +"是否自關係中刪除？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402 +msgid "Split way segment" +msgstr "分割路徑區段" + +#. leave message in one tr() as there is a grammatical +#. connection. +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426 +msgid "" +"You are about to delete nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you don't see) might " +"use them.
Do you really want to delete?" +msgstr "" +"您將要刪除在下載的區域外的節點。
這樣有時會發生問題，因為其他物件（您沒有" +"看到的）可能會使用它們。
確定要刪除嗎？" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434 +#, fuzzy +msgid "Delete confirmation" +msgstr "自關係中刪除" + +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#, java-format +msgid "Resolve conflicts in deleted state in {0}" +msgstr "解決 {0} 刪除狀態的衝突" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +msgid "Move" +msgstr "移動" + +#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117 +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 +msgid "node" +msgid_plural "nodes" +msgstr[0] "節點" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 +msgid "Purging 1 primitive" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 +#, java-format +msgid "removing reference from way {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193 +#, java-format +msgid "" +"Warning: Purging way {0} because number of nodes dropped below 2. Current is " +"{1}" +msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201 +#, java-format +msgid "removing reference from relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#, java-format +msgid "Resolve conflicts in member list of relation {0}" +msgstr "解決關係 {0} 的成員清單的衝突" + +#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68 +#, java-format +msgid "Remove relation member {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 +#, java-format +msgid "Rotate {0} {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 +msgid "Sequence" +msgstr "次序" + +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 +#, java-format +msgid "Resolve {0} tag conflicts in {1} {2}" +msgstr "解決 {1} {2} 中的 {0} 標籤衝突" + +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 +#, 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 "解決 {0} {1} 的版本衝突" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#, java-format +msgid "Resolve conflicts in node list of of way {0}" +msgstr "解決路徑 {0} 的節點清單衝突" + +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75 +#, java-format +msgid "Main dataset does not include node {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 +msgid "Apply?" +msgstr "是否接受？" + +#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146 +msgid "" +"When reversing this way, the following changes to properties of the way and " +"its nodes are suggested in order to maintain data consistency." +msgstr "" +"在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變" +"更。" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27 +msgid "Relation" +msgstr "關係" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29 +msgid "Old role" +msgstr "舊的角色" + +#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31 +msgid "New role" +msgstr "新的角色" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 +msgid "Old key" +msgstr "舊的設定鍵" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25 +msgid "Old value" +msgstr "舊的數值" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27 +msgid "New key" +msgstr "新的設定鍵" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232 +msgid "New value" +msgstr "新的數值" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 +msgid "Apply selected changes" +msgstr "套用選取的變更" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 +msgid "Don't apply changes" +msgstr "不要套用變更" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87 +msgid "Please select which property changes you want to apply." +msgstr "請選擇要接受的屬性變更。" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99 +msgid "Properties of " +msgstr "屬性 " + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125 +msgid "Roles in relations referring to" +msgstr "關係中的角色參照到" + +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146 +msgid "Automatic tag correction" +msgstr "自動修正標籤" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327 +#, java-format +msgid "Malformed config file at lines {0}" +msgstr "設定檔案第 {0} 行格式不良" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339 +#, java-format +msgid "Cannot open preferences directory: {0}" +msgstr "不能開啓偏好設定目錄：{0}" + +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364 +#, java-format +msgid "Preferences file had errors. Making backup of old one to {0}." +msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88 +#, java-format +msgid "Preferences stored on {0}" +msgstr "偏好設定儲存於 {0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96 +#, java-format +msgid "Could not upload preferences. Reason: {0}" +msgstr "無法上傳偏好設定。理由：{0}" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112 +msgid "Could not load preferences from server." +msgstr "無法從伺服器載入偏好設定。" + +#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218 +#, java-format +msgid "" +"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: " +"{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 +#, java-format +msgid "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31 @@ -2545,5 +2839,5 @@ msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320 #, java-format msgid "parameter {0} > 0 required. Got {1}." @@ -2552,62 +2846,62 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166 msgid "incomplete" msgstr "不完整" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Error: {0}" msgstr "錯誤：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43 #, java-format msgid "Warning: {0}" msgstr "警告：{0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 msgid "nodes" msgstr "節點" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" msgid_plural "ways" msgstr[0] "路徑" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "ways" msgstr "路徑" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" msgid_plural "relations" msgstr[0] "關係" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 msgid "relations" msgstr "關係" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changeset" msgstr "變更組合" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 msgid "changesets" msgstr "變更組合" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52 #, java-format msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''" @@ -2620,23 +2914,23 @@ msgstr[0] "{0} 成員" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174 msgid "highway" msgstr "公路" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175 #: build/trans_presets.java:3002 msgid "railway" msgstr "鐵路" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176 msgid "waterway" msgstr "航道" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177 msgid "landuse" msgstr "土地利用" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338 #, java-format msgid "{0} node" @@ -2690,5 +2984,5 @@ msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231 msgid "Area style way is not closed." msgstr "區域類型的路徑並未封閉。" @@ -2826,9 +3120,4 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 -#, java-format -msgid " [id: {0}]" -msgstr " [id: {0}]" - #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 msgid "inactive" @@ -2845,5 +3134,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 msgid "background" msgstr "背景" @@ -2854,8 +3143,8 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27 -msgid "WGS84 Geographisch" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117 +msgid "WGS84 Geographic" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111 msgid "" "IMPORTANT : data positioned far away from\n" @@ -2871,5 +3160,5 @@ "並在新的區域開啟新的圖層。" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144 msgid "Lambert Zone (France)" msgstr "Lambert Zone (法國)" @@ -2892,22 +3181,131 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43 -msgid "Could not read bookmarks." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 +#, fuzzy, java-format +msgid "Could not read bookmarks.
{0}" msgstr "無法讀取書籤。" -#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57 -msgid "Could not write bookmark." +#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66 +#, fuzzy, java-format +msgid "Could not write bookmark.
{0}" msgstr "無法寫入書籤。" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 +msgid "Do not show again" +msgstr "不再顯示" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40 +#, java-format +msgid "" +"Failed to initialize communication with the OSM server {0}.\n" +"Check the server URL in your preferences and your internet connection." +msgstr "" +"初始化與 OSM 伺服器 {0} 的連線失敗。\n" +"請檢查您的偏好設定中的伺服器 URL 和網際網路連線。" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 +#, java-format +msgid "" +"Uploading to the server failed because your " +"current
dataset violates a precondition.
The error message is:
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66 +msgid "Precondition violation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207 +#: build/trans_presets.java:320 build/trans_presets.java:321 +#: build/trans_presets.java:322 build/trans_presets.java:323 +#: build/trans_presets.java:324 build/trans_presets.java:325 +#: build/trans_presets.java:326 build/trans_presets.java:327 +#: build/trans_presets.java:328 build/trans_presets.java:329 +#: build/trans_presets.java:330 build/trans_presets.java:524 +#: build/trans_presets.java:525 build/trans_presets.java:526 +#: build/trans_presets.java:545 build/trans_presets.java:546 +#: build/trans_presets.java:547 build/trans_presets.java:566 +#: build/trans_presets.java:567 build/trans_presets.java:568 +#: build/trans_presets.java:587 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:608 +#: build/trans_presets.java:609 build/trans_presets.java:610 +#: build/trans_presets.java:629 build/trans_presets.java:630 +#: build/trans_presets.java:631 build/trans_presets.java:766 +#: build/trans_presets.java:781 build/trans_presets.java:1314 +#: build/trans_presets.java:1376 +msgid "unknown" +msgstr "不明" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108 +#, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''
for " +"security reasons. This is most likely because you are running
in an " +"applet and because you didn''t load your applet from ''{1}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117 +#, fuzzy +msgid "Security exception" +msgstr "未預期的例外" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Please " +"check your internet connection." +msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Network exception" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163 +#, fuzzy, java-format +msgid "" +"Failed to open a connection to the remote server
''{0}''.
Host " +"name ''{1}'' couldn''t be resolved.
Please check the API URL in your " +"preferences and your internet connection." +msgstr "" +"初始化與 OSM 伺服器 {0} 的連線失敗。\n" +"請檢查您的偏好設定中的伺服器 URL 和網際網路連線。" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173 +#, fuzzy +msgid "Unknown host" +msgstr "不明的記錄格式" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266 +#, java-format +msgid "" +"Uploading failed because a primitive you tried " +"to
delete on the server is already deleted.

The error message is:" +"
{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 +msgid "Primitive already deleted" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152 +#, java-format +msgid "Warning: failed to bring extended dialog always on top. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65 msgid "Message of the day not available" msgstr "無法取得當天的訊息。" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67 #, java-format msgid "- running version is {0}" msgstr "- 執行的版本是 {0}" -#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 +#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97 msgid "Downloading \"Message of the day\"" msgstr "正在下載「當天的訊息」" @@ -2986,62 +3384,57 @@ msgstr "密碼" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 -#, java-format -msgid "Unable to find translation for the locale {0}. Reverting to {1}." -msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98 msgid "usage" msgstr "用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100 msgid "options" msgstr "選項" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101 msgid "Show this help" msgstr "顯示此說明訊息" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "Standard unix geometry argument" msgstr "標準 unix 幾何引數" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Download the bounding box" msgstr "下載此綁定方塊" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105 msgid "Open file (as raw gps, if .gpx)" msgstr "開啟檔案(若為 .gpx 則是原始 gps)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106 msgid "Download the bounding box as raw gps" msgstr "下載綁定方塊做為原始 gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107 msgid "Select with the given search" msgstr "選取指定的搜尋" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108 msgid "Launch in maximized mode" msgstr "以最大化模式啓動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109 msgid "Reset the preferences to default" msgstr "重設偏好設定為預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110 msgid "Set the language." msgstr "設定語言。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111 msgid "examples" msgstr "範例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -3051,51 +3444,51 @@ "--selection 前載入某些資料" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118 msgid "Instead of --download= you may specify osm://\n" msgstr "要取代 --download= 可以指定 osm://\n" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124 msgid "Activating updated plugins" msgstr "使用更新後的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127 msgid "Loading early plugins" msgstr "載入較早的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130 msgid "Setting defaults" msgstr "設定預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137 msgid "Loading plugins" msgstr "正在載入外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156 msgid "File" msgstr "檔案" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158 msgid "View" msgstr "檢視" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 msgid "Tools" msgstr "工具" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Presets" msgstr "預設組合" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 #, java-format msgid "Menu: {0}" @@ -3103,21 +3496,21 @@ #. TODO move code to an "action" like the others? -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231 msgid "Wireframe View" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233 msgid "Toggle Wireframe view" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259 msgid "Full Screen" msgstr "全螢幕" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261 msgid "Toggle Full Screen view" msgstr "切換全螢幕檢視" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302 msgid "Audio" msgstr "音效" @@ -3161,53 +3554,68 @@ msgstr "縮放" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 msgid "The geographic longitude at the mouse pointer." msgstr "滑鼠指標所在的地理經度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96 msgid "The name of the object at the mouse pointer." msgstr "滑鼠指標所在的物件名稱。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 msgid "The geographic latitude at the mouse pointer." msgstr "滑鼠指標所在的地理緯度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 msgid "The angle between the previous and the current way segment." msgstr "前一個路徑區段與目前區段之間的角度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 msgid "The (compass) heading of the line segment being drawn." msgstr "繪出線段的（指南針）箭頭。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101 msgid "The length of the new way segment being drawn." msgstr "繪出新的路徑區段的長度。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167 msgid "(no object)" msgstr "(沒有物件)" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284 msgid "layer not in list." msgstr "圖層不在清單中。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352 -#, java-format -msgid "Layer {0} must be in list of layers" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27 -msgid "Contacting the OSM server..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423 +#, java-format +msgid "Layer ''{0}'' must be in list of layers" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57 +#, java-format +msgid "" +"Warning: failed to put option pane dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63 +#, java-format +msgid "" +"Warning: failed to put ''please wait dialog'' always on top. Exception was: " +"{0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 msgid "Error while parsing" msgstr "分析時發生錯誤" -#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101 +#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79 msgid "File not found" msgstr "找不到檔案" + +#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 +#, java-format +msgid " [id: {0}]" +msgstr " [id: {0}]" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -3229,4 +3637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49 msgid "Initializing" msgstr "初始化" @@ -3258,20 +3667,20 @@ msgstr "角色 {0} 沒有參與比較配對 {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204 msgid "Properties" msgstr "屬性" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228 msgid "Tags" msgstr "標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -3279,47 +3688,47 @@ msgstr "節點" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172 msgid "No pending tag conflicts to be resolved" msgstr "沒有待解決的標籤衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175 #, java-format msgid "Tags({0} conflicts)" msgstr "標籤({0} 衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "{0} 個標籤衝突待解決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183 msgid "Nodes(resolved)" msgstr "節點(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187 msgid "Nodes(with conflicts)" msgstr "節點(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188 msgid "Pending conflicts in the node list of this way" msgstr "這個路徑的節點清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192 msgid "Members(resolved)" msgstr "成員(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -3327,25 +3736,25 @@ msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196 msgid "Members(with conflicts)" msgstr "成員(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197 msgid "Pending conflicts in the member list of this relation" msgstr "這個關係的成員清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205 msgid "No pending property conflicts" msgstr "沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208 msgid "Properties(with conflicts)" msgstr "屬性(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209 msgid "Pending property conflicts to be resolved" msgstr "待解決的屬性衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287 msgid "Conflict Resolution" msgstr "衝突的決議" @@ -3382,5 +3791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 msgid "My version" msgstr "我的版本" @@ -3391,5 +3800,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137 msgid "Merged version" @@ -3403,5 +3812,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 msgid "Their version" msgstr "他們的版本" @@ -3476,7 +3885,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" @@ -3547,14 +3955,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 msgid "parameter '{0}' must not be null" msgstr "參數「{0}」不能為空值(null)" @@ -3583,10 +3991,10 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181 #, java-format msgid "unexpected column index. Got {0}" msgstr "未預期的欄位索引。得到 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422 #, java-format msgid "" @@ -3595,19 +4003,19 @@ msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426 msgid "Communication with server failed" msgstr "與伺服器溝通失敗" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496 msgid "Yes, undelete them too" msgstr "是的，也取消它們的刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497 msgid "No, cancel operation" msgstr "不，取消操作" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473 #, java-format msgid "" @@ -3618,9 +4026,9 @@ "

是否要一併取消這些節點的刪除？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478 msgid "Undelete additional nodes?" msgstr "取消刪除額外的節點？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501 #, java-format msgid "" @@ -3630,13 +4038,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83 msgid "Properties in my dataset, i.e. the local dataset" msgstr "我的資料組合的屬性，例如本地端資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89 msgid "" "Properties in the merged element. They will replace properties in my " @@ -3644,90 +4052,90 @@ msgstr "合併元件的屬性。當合併的決定被接受時它們會取代我的元件中的屬性。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95 msgid "Properties in their dataset, i.e. the server dataset" msgstr "他們的資料組合的屬性，例如伺服器資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111 msgid "Coordinates:" msgstr "坐標：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187 msgid "Deleted State:" msgstr "刪除的狀態：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264 msgid "Visible State:" msgstr "可視狀態：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364 -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "（沒有）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358 msgid "deleted" msgstr "已刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360 msgid "not deleted" msgstr "未刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367 msgid "visible (on the server)" msgstr "可視的（在伺服器上）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369 msgid "not visible (on the server)" msgstr "不可視（在伺服器上）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376 msgid "Keep a clone of the local version" msgstr "保留本地端版本的複本" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378 msgid "Physically delete from local dataset" msgstr "實際從本地端資料組合中刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477 msgid "Keep my coordiates" msgstr "保留我的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492 msgid "Keep their coordiates" msgstr "保留他們的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507 msgid "Undecide conflict between different coordinates" msgstr "在不同的坐標之間未解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522 msgid "Keep my deleted state" msgstr "保留我的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537 msgid "Keep their deleted state" msgstr "保留他們的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552 msgid "Undecide conflict between deleted state" msgstr "已刪除狀態之間未解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567 msgid "Keep my visible state" msgstr "保留我的可見性狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 msgid "Yes, reset the id" msgstr "是，重設 id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624 msgid "No, abort" msgstr "否，中止" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587 #, java-format msgid "" @@ -3739,5 +4147,5 @@ "上傳時伺服器會重新分配
新的 id 給它。
您是否同意？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595 msgid "Reset id to 0" msgstr "重設 id 為 0" @@ -3762,12 +4170,11 @@ msgstr "從資料組合移除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 +#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646 msgid "Undecide conflict between visible state" msgstr "" -#. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3812,10 +4219,10 @@ #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -3824,10 +4231,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -3836,5 +4243,5 @@ msgstr "數值" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100 msgid "cannot apply undecided tag merge item" msgstr "不能接受未決定的標籤合併項目" @@ -3894,9 +4301,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 @@ -3904,5 +4311,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 #, java-format msgid "Toggle: {0}" @@ -3932,45 +4339,62 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98 msgid "" "Set the selected elements on the map to the selected items in the list above." msgstr "在地圖上設定選取的元件為上列清單中選取的項目。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130 -msgid "Resolve conflicts" -msgstr "解決衝突" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151 +#: ../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:165 +#: ../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:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 msgid "Apply Resolution" msgstr "套用解決方案" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174 -msgid "Apply partial resolutions" -msgstr "套用部分解決方案" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199 +#, fuzzy +msgid "Close anyway" +msgstr "強制繼續" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200 msgid "Continue resolving" msgstr "繼續解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177 -#, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 +#, fuzzy, java-format msgid "" -"You didn''t finish to resolve all conflicts.
Click {0} to apply already resolved conflicts anyway.
You can resolve the " -"remaining conflicts later.
Click {1} to return to " -"resolving conflicts." +"You didn''t finish to merge the differences in this conflict." +"
Conflict resolutions won't be applied unless all differences
are " +"resolved.Click {0} to close anyway." +"Already
resolved differences won't be applied.
Click " +"{1} to return to resolving conflicts." msgstr "" "您並未完全解決所有的衝突。
點選 {0} 強制接受已解決" "的衝突。
您可以稍後解決剩下的衝突。
點選 {1} 返回以解" "決衝突。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210 +msgid "Conflict not resolved completely" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246 +msgid "Resolve conflicts" +msgstr "解決衝突" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#, fuzzy, java-format +msgid "Resolve conflicts for ''{0}''" +msgstr "解決 {0} {1} 的版本衝突" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194 @@ -3988,96 +4412,130 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311 #, java-format msgid "index out of bounds Got {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366 msgid "History item" msgstr "歷史記錄項目" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387 msgid "Load history" msgstr "載入歷史紀錄" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414 #, java-format msgid "Loading history for {0} with id {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451 msgid "Reload all currently selected objects and refresh the list." msgstr "重新載入所有目前的物件並重新整理清單。" #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474 msgid "Show" msgstr "顯示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475 msgid "Display the history of the selected primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85 +msgid "Dialog not created yet. Invoke createInstance() first" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143 +msgid "Layers" +msgstr "圖層" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142 +msgid "Open a list of all loaded layers." +msgstr "開啟所有載入圖層的清單。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272 msgid "Delete the selected layer." msgstr "刪除選取的圖層。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80 -msgid "There are unsaved changes. Delete the layer anwyay?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#, fuzzy, java-format +msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" msgstr "還有未儲存的變更。是否強制刪除圖層？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 msgid "Delete Layer" msgstr "刪除圖層" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86 -msgid "Do you really want to delete the whole layer?" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308 +#, fuzzy, java-format +msgid "Do you really want to delete layer ''{0}''?" msgstr "確定要刪除整個圖層？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 +#, fuzzy +msgid "Confirmation" +msgstr "資訊" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300 +#, fuzzy +msgid "Yes" +msgstr "是" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301 +#, fuzzy +msgid "No" +msgstr "北" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302 +#, fuzzy +msgid "Delete all" +msgstr "刪除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309 +#, fuzzy, java-format +msgid "Deleting layer {0} of {1}" +msgstr "刪除 {0} {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 msgid "Show/Hide" msgstr "顯示/隱藏" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422 msgid "Toggle visible state of the selected layer." msgstr "切換選取的圖層可見性狀態。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123 -msgid "Show/Hide Text/Icons" -msgstr "顯示/隱藏文字/圖示" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124 -msgid "Toggle visible state of the marker text and icons." -msgstr "切換標記文字和圖示的可見性狀態。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 -msgid "Layers" -msgstr "圖層" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164 -msgid "Open a list of all loaded layers." -msgstr "開啟所有載入圖層的清單。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458 +#, fuzzy +msgid "Activate" +msgstr "私人的" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#, fuzzy +msgid "Activate the selected layer" +msgstr "刪除選取的圖層。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516 +#, fuzzy +msgid "Merge this layer into another layer" +msgstr "將下列圖層直接合併至選取的圖層。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622 msgid "Move the selected layer one row up." msgstr "將選取的圖層上移一列。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641 msgid "Move the selected layer one row down." msgstr "將選取的圖層下移一列。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259 -msgid "Merge the layer directly below into the selected layer." -msgstr "將下列圖層直接合併至選取的圖層。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292 -#, java-format -msgid "Layers: {0}" -msgstr "圖層：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34 +#, fuzzy +msgid "Information about layer" +msgstr "資訊板" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 #, java-format msgid "This will change up to {0} object." @@ -4085,22 +4543,28 @@ msgstr[0] "這會改變 {0} 個物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144 msgid "An empty value deletes the key." msgstr "空白的數值會刪除該設定鍵。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97 msgid "" msgstr "<不同>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 msgid "Change values?" msgstr "是否改變數值？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205 +#, java-format +msgid "" +"Warning: failed to put properties dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 #, java-format msgid "Change properties of up to {0} object" @@ -4108,84 +4572,89 @@ msgstr[0] "改變屬性至 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 msgid "Please select a key" msgstr "請選擇一個設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 msgid "Please select a value" msgstr "請選擇一個數值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 +#, java-format +msgid "Warning: failed to put dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469 msgid "Please select the objects you want to change properties for." msgstr "請選擇您要改變屬性的物件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476 msgid "Properties/Memberships" msgstr "屬性/成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475 msgid "Properties for selected objects." msgstr "選取物件的屬性。" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511 msgid "Member Of" msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Change relation" msgstr "改變關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #, java-format msgid "Really delete selection from relation {0}?" msgstr "確定要刪除關係 {0} 的選擇區域？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624 msgid "Add Properties" msgstr "加入屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69 msgid "Add" msgstr "加入" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 msgid "Add a new key/value pair to all objects" msgstr "將新的設定鍵/數值配對加入到所有的物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630 msgid "Edit Properties" msgstr "編輯屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 msgid "Edit the value of the selected key for all objects" msgstr "編輯所有物件選取設定鍵的數值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636 msgid "Delete Properties" msgstr "删除屬性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 msgid "Delete the selected key in all objects" msgstr "刪除所有物件中選取的設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "屬性：{0} / 成員：{1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843 msgid "Properties / Memberships" msgstr "屬性 / 成員" @@ -4194,63 +4663,65 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147 #: build/trans_presets.java:2967 msgid "Relations" msgstr "關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 msgid "Open a list of all relations." msgstr "開啓所有關係的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145 +#, java-format +msgid "Relations: {0}" +msgstr "關係：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243 +msgid "Open an editor for the selected relation" +msgstr "開啓選取的關係編輯器" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 +msgid "Delete the selected relation" +msgstr "刪除選取的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316 msgid "Create a new relation" msgstr "建立新的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 -#, java-format -msgid "Relations: {0}" -msgstr "關係：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 -msgid "Open an editor for the selected relation" -msgstr "開啓選取的關係編輯器" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 -msgid "Delete the selected relation" -msgstr "刪除選取的關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85 msgid "Current Selection" msgstr "目前的選擇區域" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84 msgid "Open a selection list window." msgstr "開啓選擇區域清單視窗。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131 msgid "Zoom to selected element(s)" msgstr "縮放至選取的元件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 msgid "Refresh the selection list." msgstr "重新整理選擇區域清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157 msgid "Zoom to selection" msgstr "縮放至選擇區域" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "Sel.: Rel.:{0} / 路徑:{1} / 節點:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" msgstr "選擇區域" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334 #, java-format msgid "{0} way" @@ -4258,5 +4729,5 @@ msgstr[0] "{0} 路徑" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #, java-format msgid "{0} relation" @@ -4264,5 +4735,5 @@ msgstr[0] "{0} 關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format msgid "Selection: {0}" @@ -4273,148 +4744,421 @@ msgstr "解鎖面板" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167 +#, java-format +msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227 msgid "Click to minimize/maximize the panel content" msgstr "點選以最小化/最大化面板內容" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125 msgid "Authors" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 msgid "Open a list of people working on the selected objects." msgstr "開啟在編輯選取物件的使用者的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "Author" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59 msgid "# Objects" msgstr "# 物件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123 #, java-format msgid "Authors: {0}" msgstr "作者：{0}" -#. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377 +msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 +msgid "Download all child relations (recursively)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224 +#, fuzzy +msgid "Download All Children" +msgstr "下載區域" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#, fuzzy +msgid "Download selected relations" +msgstr "刪除選取的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247 +#, fuzzy +msgid "Download Selected Children" +msgstr "下載可見的拼貼" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459 +msgid "Download relation members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488 +msgid "Conflicts in data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346 +#, java-format +msgid "" +"The child relation
{0}
is deleted on the server. It can't be " +"loaded" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355 +#, fuzzy +msgid "Relation is deleted" +msgstr "尚未選取關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524 +#, fuzzy, java-format +msgid "Downloading relation {0}" +msgstr "正在下載外掛程式 {0}..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#, java-format +msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162 +msgid "Tags and Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172 +msgid "Parent Relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165 +#, fuzzy +msgid "Child Relations" +msgstr "關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186 +#, java-format +msgid "" +"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}" +msgstr "" + +#. --- role editing +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593 +msgid "Role:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651 +msgid "" +"There is at least one member in this relation referring
to the " +"relation itself.
This creates circular dependencies and is dicuraged." +"
How do you want to proceed with circular dependencies?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#, fuzzy +msgid "Remove them, clean up relation" +msgstr "從關係中移除元件" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658 +msgid "Ignore them, leave relation as is" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683 +#, java-format +msgid "" +"This relation already has one or more members referring to
the " +"primitive ''{0}''

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

This creates " +"circular references and is therefore discouraged.
Skipping relation " +"''{0}''." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752 +msgid "" +"Add all primitives selected in the current dataset before the first member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 +msgid "" +"Add all primitives selected in the current dataset after the last member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 +msgid "" +"Add all primitives selected in the current dataset before the first selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 +msgid "" +"Add all primitives selected in the current dataset after the last selected " +"member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 +msgid "Remove all members referring to one of the selected primitives" +msgstr "" + +#. putValue(NAME, tr("Remove Selected")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875 +msgid "Relation Editor: Remove Selected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +msgid "Sort the relation members" +msgstr "" + +#. putValue(NAME, tr("Sort")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgid "Relation Editor: Sort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919 +msgid "Move the currently selected members up" +msgstr "將目前選取的成員上移" + +#. putValue(NAME, tr("Move Up")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922 +msgid "Relation Editor: Move Up" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938 +msgid "Move the currently selected members down" +msgstr "將目前選取的成員下移" + +#. putValue(NAME, tr("Move Down")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941 +msgid "Relation Editor: Move Down" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957 +#, fuzzy +msgid "Remove the currently selected members from this relation" +msgstr "將所有目前選取的物件從關係中移除" + +#. putValue(NAME, tr("Remove")); +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960 +msgid "Relation Editor: Remove" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 +#, fuzzy +msgid "Delete the currently edited relation" +msgstr "刪除選取的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059 +msgid "Yes, create a conflict and close" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#, fuzzy +msgid "No, continue editing" +msgstr "繼續解決" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064 +msgid "" +"This relation has been changed outside of the editor.
You can't " +"apply your changes and continue editing.

Do you want to create a " +"conflict and close the editor?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068 +#, fuzzy +msgid "Conflict in data" +msgstr "衝突的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for primitive
''{1}''." +"
Please resolve this conflict first, then try again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#, fuzzy +msgid "Apply the current updates" +msgstr "儲存現在的資料" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101 +msgid "Apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +msgid "Apply the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../plugins/grid/src/grid/GridLayer.java:162 +#: ../plugins/grid/src/grid/GridLayer.java:199 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 +msgid "OK" +msgstr "確定" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166 +msgid "Cancel the updates and close the dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 +msgid "Add an empty tag" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196 +msgid "Delete the currently selected tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +msgid "Download all incomplete ways and nodes in relation" +msgstr "下載關係中所有不完整的路徑和節點" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +msgid "Download Members" +msgstr "下載成員" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +msgid "Relation Editor: Download Members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282 +msgid "Sets a role for the selected members" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285 +msgid "Apply Role" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#, java-format +msgid "" +"You are setting an empty role on {0} primitives.
This is equal to " +"deleting the roles of these primitives.
Do you really want to apply the " +"new role?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302 +#, fuzzy +msgid "Yes, apply it" +msgstr "是，清除它" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 +msgid "No, don't apply" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#, fuzzy +msgid "Confirm empty role" +msgstr "確認遠端控制動作" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354 +msgid "Create a copy of this relation and open it in another editor window" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198 +#, fuzzy +msgid "Zoom to" +msgstr "拉起" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229 +#, fuzzy +msgid "Zoom to primitive the first selected member refers to" +msgstr "將目前選取的成員下移" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 +msgid "Zooming disabled because layer of this relation is not active" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225 +msgid "Zooming disabled because there is no selected member" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +msgid "Refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 +msgid "Linked" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 +msgid "Download referring relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82 +#, java-format +msgid "child.id >0 expected. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78 +msgid "including immediate children of parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 +msgid "Load parent relations" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157 +msgid "Edit the currently selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 msgid "Apply Changes" msgstr "套用變更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 -msgid "Basic" -msgstr "基本" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "Occupied By" -msgstr "被此佔據：" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 -msgid "linked" -msgstr "已連結" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move Up" -msgstr "上移" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 -msgid "Move the currently selected members up" -msgstr "將目前選取的成員上移" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 -msgid "Add Selected" -msgstr "加入選取的" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 -msgid "Add all currently selected objects as members" -msgstr "將所有目前選取的物件加入為成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 -msgid "Remove Selected" -msgstr "移陳選取的" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 -msgid "Remove all currently selected objects from relation" -msgstr "將所有目前選取的物件從關係中移除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 -msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move Down" -msgstr "下移" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 -msgid "Move the currently selected members down" -msgstr "將目前選取的成員下移" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 -msgid "Remove the member in the current table row from this relation" -msgstr "將目前表格列中的成員自這個關係中移除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 -msgid "Download Members" -msgstr "下載成員" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 -msgid "Download all incomplete ways and nodes in relation" -msgstr "下載關係中所有不完整的路徑和節點" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 -#, java-format -msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 -#, java-format -msgid "Relation Editor: {0}" -msgstr "關係編輯器：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 -msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 -#, java-format -msgid "There were {0} conflicts during import." -msgstr "匯入時有 {0} 個衝突。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 -msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 -#, java-format -msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118 #, java-format msgid "Create new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122 #, java-format msgid "Edit relation #{0} in layer ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115 +#, fuzzy +msgid "Load relation" +msgstr "載入選擇區域" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161 +msgid "Warning: ignoring exception because task was cancelled. Exception was: " msgstr "" @@ -4424,5 +5168,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342 #, java-format @@ -4431,24 +5175,22 @@ msgstr[0] "移除 {0} 個物件之多的舊設定鍵" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 -#, java-format -msgid "Updating properties of up to {0} object" -msgid_plural "Updating properties of up to {0} objects" -msgstr[0] "更新 {0} 個物件之多的屬性" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45 msgid "Bookmarks" msgstr "書籤" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 msgid "Please enter the desired coordinates first." msgstr "請先輸入想要的坐標。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90 msgid "Please enter a name for the location." msgstr "請輸入此位置的名稱。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 +#, fuzzy +msgid "Name of location" +msgstr "改變位置" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108 msgid "Select a bookmark first." msgstr "先選擇一個書籤。" @@ -4481,34 +5223,34 @@ #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 msgid "Data Sources and Types" msgstr "資料來源和類型" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164 msgid "Download as new layer" msgstr "下載為新圖層" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 msgid "Download Area" msgstr "下載區域" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216 msgid "Download area too large; will probably be rejected by server" msgstr "下載區域太大；可能會被伺服器拒絕" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "Download area ok, size probably acceptable to server" msgstr "下載區域確定，大小應該會被伺服器接受" #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121 msgid "Null pointer exception, possibly some missing tags." msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171 msgid "Please enter a search string" msgstr "請輸入搜尋字串" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195 msgid "Cannot read place search results from server" msgstr "不能從伺服器讀取位置搜尋結果" @@ -4516,5 +5258,5 @@ #. this is manually tuned so that it looks nice on a GNOME #. desktop - maybe needs some cross platform proofing. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217 msgid "Enter a place name to search for:" msgstr "輸入要搜尋位置的名稱：" @@ -4522,5 +5264,5 @@ #. item "Health/Veterinary" text "Name" #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229 #: build/trans_presets.java:2612 msgid "Places" @@ -4528,6 +5270,6 @@ #. TODO - this is probably not the coolest way to set relative sizes? -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252 msgid "name" msgstr "名稱" @@ -4566,6 +5308,6 @@ #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -4588,15 +5330,15 @@ msgstr "類型" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254 msgid "near" msgstr "靠近" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "zoom" msgstr "縮放" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121 msgid "" "Zoom: Mousewheel, double click or Ctrl + Up/Down Move map: " @@ -4605,5 +5347,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 +#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124 msgid "Slippy map" msgstr "快速地圖" @@ -4635,5 +5377,11 @@ msgstr "{0} {1} 的歷史紀錄" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74 +#, java-format +msgid "" +"Warning: failed to put history browser always on top. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121 msgid "Close the dialog" msgstr "關閉這個對話盒" @@ -5375,5 +6123,5 @@ #. #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 #: build/trans_presets.java:64 build/trans_presets.java:100 #: build/trans_presets.java:140 build/trans_presets.java:177 @@ -5542,197 +6290,187 @@ msgstr "版本" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278 #, java-format msgid "Images for {0}" msgstr "{0} 的圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 msgid "Read GPX..." msgstr "讀取 GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304 #, java-format msgid "No time for point {0} x {1}" msgstr "點 {0} x {1} 沒有時刻" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "不能讀取點 {1} x {2} 的時刻「{0}」" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322 msgid "No images with readable timestamps found." msgstr "找不到具可讀時刻戳記的圖片。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." msgstr "正在讀取 {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247 msgid "Geotagged Images" msgstr "有 Geotag 的圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 #, java-format msgid "GPS start: {0}" msgstr "GPS 開始：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589 #, java-format msgid "GPS end: {0}" msgstr "GPS 結束：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "current delta: {0}s" msgstr "目前的差分： {0}秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 msgid "timezone difference: " msgstr "時區差異： " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 msgid "image" msgid_plural "images" msgstr[0] "圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618 #, java-format msgid "{0} within the track." msgstr "{0} 在此軌跡中。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677 msgid "Sync clock" msgstr "同步時鐘" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39 msgid "JPEG images (*.jpg)" msgstr "JPEG 圖片 (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "檔案「{0}」的日期無法解析。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "在檔案「{0}」中沒有 EXIF 時刻。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751 msgid "Image" msgstr "圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "GPS unit timezone (difference to photo)" msgstr "GPS 單元時區 (不同於照片)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768 msgid "Synchronize Time with GPS Unit" msgstr "與 GPS 單元同步時刻" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 msgid "Time entered could not be parsed." msgstr "輸入的時刻無法解析。" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233 msgid "gps point" msgstr "gps 點" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "自訂線條的繪製" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "使用全域設定值。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "在這個圖層的各點之間繪出線條。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "在這個圖層的各點之間不要繪出線條。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 msgid "Select line drawing options" msgstr "選擇線條繪製選項" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195 msgid "Customize Color" msgstr "自訂顏色" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 -#: ../plugins/grid/src/grid/GridLayer.java:162 -#: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334 -msgid "OK" -msgstr "確定" - -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 #: ../plugins/grid/src/grid/GridLayer.java:162 msgid "Default" msgstr "預設值" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../plugins/grid/src/grid/GridLayer.java:163 msgid "Choose a color" msgstr "選擇一種顏色" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181 msgid "Markers From Named Points" msgstr "已命名點的標記" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196 #, java-format msgid "Named Trackpoints from {0}" msgstr "{0} 的已命名軌跡點" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204 msgid "Import Audio" msgstr "匯入音效" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220 msgid "Wave Audio files (*.wav)" msgstr "Wave 音效檔案 (*.wav)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256 #, java-format msgid "Audio markers from {0}" msgstr "{0} 的音效標記" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271 msgid "Import images" msgstr "匯入圖片" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330 #, java-format msgid "{0} track, " @@ -5740,5 +6478,5 @@ msgstr[0] "{0} 軌跡， " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331 #, java-format msgid "{0} route, " @@ -5746,5 +6484,5 @@ msgstr[0] "{0} 路線， " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332 #, java-format msgid "{0} waypoint" @@ -5752,30 +6490,30 @@ msgstr[0] "{0} 航點" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335 #, java-format msgid "Name: {0}" msgstr "名稱：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72 #, java-format msgid "Description: {0}" msgstr "描述：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364 msgid "Timespan: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371 msgid "Length: " msgstr "長度： " -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58 msgid "Convert to data layer" msgstr "轉換為資料圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -5785,43 +6523,43 @@ "軌跡，請看這裡：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218 #, java-format msgid "Converted from: {0}" msgstr "轉換自：{0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872 msgid "Download from OSM along this track" msgstr "從 OSM 沿這條軌跡下載" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756 msgid "Download everything within:" msgstr "下載這裡面的每個物件：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759 #, java-format msgid "{0} meters" msgstr "{0} 公尺" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 msgid "Maximum area per request:" msgstr "每個要求最大區域：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766 #, java-format msgid "{0} sq km" msgstr "{0} 平方公里" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865 #, java-format msgid "" @@ -5831,9 +6569,9 @@ "這個動作會發出 {0} 個
個別的下載要求。您是否希望
繼續？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961 msgid "No GPX track available in layer to associate audio with." msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -5841,5 +6579,5 @@ msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -5847,47 +6585,47 @@ msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85 #, java-format msgid "Data Layer {0}" msgstr "資料圖層 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164 msgid "outside downloaded area" msgstr "超出下載的區域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407 #, java-format msgid "{0} consists of:" msgstr "{0} 組成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411 #, java-format msgid " ({0} deleted.)" msgstr " ({0} 已刪除。)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 msgid "unset" msgstr "取消設定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510 -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155 #: build/trans_presets.java:1845 build/trans_presets.java:1851 #: build/trans_presets.java:1857 build/trans_presets.java:1863 @@ -5911,10 +6649,10 @@ msgstr[0] "軌跡" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156 msgid "point" msgid_plural "points" msgstr[0] "點" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -5922,5 +6660,5 @@ msgstr[0] "有 {0} 個點的軌跡" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -5928,5 +6666,5 @@ msgstr[0] "{0} 由 {1} 軌跡組成" -#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -5943,5 +6681,5 @@ msgstr[0] "標記" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191 #, java-format msgid "{0} consists of {1} marker" @@ -5949,29 +6687,29 @@ msgstr[0] "{0} 由 {1} 標記組成" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224 msgid "Synchronize Audio" msgstr "同步音效" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231 msgid "" "You need to pause audio at the moment when you hear your synchronization cue." msgstr "當您在聆聽同步隊列時需要暫停音效。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 #, java-format msgid "Audio synchronized at point {0}." msgstr "音效同步於點 {0}。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228 -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 msgid "Unable to synchronize in layer being played." msgstr "在播放時無法於圖層同步。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256 msgid "Make Audio Marker at Play Head" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263 msgid "" "You need to have paused audio at the point on the track where you want the " @@ -5979,10 +6717,17 @@ msgstr "您需要在軌跡上想標記的點暫停音效。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342 msgid "No existing audio markers in this layer to offset from." msgstr "這個圖層中沒有既存的音效標記可位移。" -#. Not close enough to track, or no audio marker found for some other reason -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451 +msgid "Show/Hide Text/Icons" +msgstr "顯示/隱藏文字/圖示" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 +msgid "Toggle visible state of the marker text and icons." +msgstr "切換標記文字和圖示的可見性狀態。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 msgid "" "You need to drag the play head near to the GPX track whose associated sound " @@ -5990,5 +6735,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 msgid "" "You need to SHIFT-drag the play head onto an audio marker or onto the track " @@ -5996,29 +6741,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 msgid "Unable to create new audio marker." msgstr "無法建立新的音效標記。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 msgid "There was an error while trying to display the URL for this marker" msgstr "嘗試顯示這個標記的 URL 時發生錯誤" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 msgid "(URL was: " msgstr "(URL 是： " -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46 msgid "Error displaying URL" msgstr "在顯示 URL 時發生錯誤" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Advanced Preferences" msgstr "進階的偏好設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51 msgid "Setting Preference entries directly. Use with caution!" msgstr "直接設定偏好設定項目。請小心使用！" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 @@ -6026,26 +6771,26 @@ msgstr "搜尋： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 msgid "Current value is default." msgstr "目前的數值是預設值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103 #, java-format msgid "Default value is ''{0}''." msgstr "預設值是「{0}」。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106 msgid "Default value currently unknown (setting has not been used yet)." msgstr "預設數值目前不明（設定值尚未使用）。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655 msgid "Please select the row to edit." msgstr "請選擇要編輯的列。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -6053,14 +6798,14 @@ msgstr "{0} 的新數值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96 msgid "Please select the row to delete." msgstr "請選擇要刪除的列。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270 msgid "Enter a new key/value pair" msgstr "輸入新的設定鍵/數值配對" @@ -6183,40 +6928,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "顏色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137 #, java-format msgid "Paint style {0}: {1}" msgstr "繪畫樣式 {0}：{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144 #, java-format msgid "Layer: {0}" msgstr "圖層：{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 msgid "Choose" msgstr "選擇" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161 #, java-format msgid "Choose a color for {0}" msgstr "選擇 {0} 的顏色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169 msgid "Set to default" msgstr "設為預設值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180 msgid "Set all to default" msgstr "全部設為預設值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231 msgid "Colors used by different objects in JOSM." msgstr "在 JOSM 中用於不同物件的顏色。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246 msgid "Colors" msgstr "顏色" @@ -6545,46 +7290,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46 msgid "Configure available plugins." msgstr "設定可用的外掛程式。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51 msgid "Download List" -msgstr "下載的清單" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81 +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 msgid "Update" msgstr "更新" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67 msgid "Configure Sites..." msgstr "設定網站..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 msgid "Add JOSM Plugin description URL." msgstr "加入 JOSM 外掛程式描述 URL。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93 +msgid "Enter URL" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129 msgid "Please select an entry." msgstr "請選擇一個項目。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114 msgid "Edit JOSM Plugin description URL." msgstr "編輯 JOSM 外掛程式描述 URL。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115 +#, fuzzy +msgid "JOSM Plugin description URL" +msgstr "加入 JOSM 外掛程式描述 URL。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142 msgid "Configure Plugin Sites" msgstr "設定外掛程式網站" #. some common tabs -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "Display Settings" msgstr "顯示設定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 msgid "" "Various settings that influence the visual representation of the whole " @@ -6592,29 +7346,29 @@ msgstr "各種影響整個程式視覺呈現的設定值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings" msgstr "連線設定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 msgid "Connection Settings for the OSM server." msgstr "OSM 伺服器的連線設定值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Map Settings" msgstr "地圖設定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 msgid "Settings for the map projection and data interpretation." msgstr "地圖投影與資料轉譯設定值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Audio Settings" msgstr "音效設定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45 msgid "Settings for the audio player and audio markers." msgstr "音效播放程式與音效標記的設定值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105 msgid "You have to restart JOSM for some settings to take effect." msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。" @@ -6717,59 +7471,61 @@ msgstr "捷徑鍵" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "Short Description: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 #, java-format msgid "URL: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66 #, java-format msgid "Author: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69 #, java-format msgid "Webpage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75 #, java-format msgid "Version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296 msgid "Icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246 msgid "Copy defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114 msgid "Please select the row to copy." msgstr "請選擇要複製的列。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276 #, java-format msgid "The XML source (URL or filename) for {0} definition files." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277 msgid "Add a new XML source to the list." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690 msgid "Delete the selected source from the list." msgstr "從清單刪除選取的來源。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284 msgid "Defaults (See tooltip for detailed information)" msgstr "" @@ -6944,33 +7700,33 @@ msgstr "修飾鍵群組" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414 msgid "More information about this feature" msgstr "更多關於這個功能的資訊" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432 msgid "Optional Attributes:" msgstr "額外屬性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "使用群組「{1}」的預設組合「{0}」" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "Use preset ''{0}''" msgstr "使用預設組合「{0}」" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519 msgid "closedway" msgstr "封閉路徑" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524 #, java-format msgid "Unknown type: {0}" msgstr "不明的類型：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67 @@ -6981,15 +7737,15 @@ msgstr "無法讀取標籤預設組合來源：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611 #, java-format msgid "Error parsing {0}: " msgstr "分析 {0} 時發生錯誤： " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 #, java-format msgid "Elements of type {0} are supported." msgstr "類型 {0} 的元件已支援。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -6998,18 +7754,18 @@ msgstr[0] "改變 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "尚未選擇！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675 msgid "Selection unsuitable!" msgstr "選擇區域不合適！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683 msgid "Apply Preset" msgstr "套用預設組合" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756 msgid "Change Properties" msgstr "改變屬性" @@ -7020,33 +7776,36 @@ msgstr "預設組合群組「{0}」" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." msgstr "正在連接 OSM 伺服器..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51 #, java-format msgid "Downloading points {0} to {1}..." msgstr "正在下載點 {0} 到 {1}..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33 -#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49 -msgid "Downloading OSM data..." -msgstr "正在下載 OSM 資料..." - #. SAXException does not chain correctly #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 msgid "NullPointerException, possibly some missing tags." msgstr "空指標例外(NullPointerException)，可能是缺少標籤。" -#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82 +#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 msgid "Preparing data..." msgstr "正在準備資料..." + +#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 +#, java-format +msgid "Could not read \"{0}\"" +msgstr "不能讀取 \"{0}\"" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22 @@ -7054,21 +7813,21 @@ msgstr "GPX 檔案" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49 -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124 #, java-format msgid "Markers from {0}" msgstr "{0} 的標記" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39 #, java-format msgid "File \"{0}\" does not exist" msgstr "檔案「{0}」不存在" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42 #, java-format msgid "Parsing file \"{0}\" failed" @@ -7084,10 +7843,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 +#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46 +#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97 +msgid "Downloading OSM data..." +msgstr "正在下載 OSM 資料..." + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#, java-format +msgid "Fetching {0} with id {1} from ''{2}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 +#, java-format +msgid "Fetching a package of {0} from ''{1}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -7095,48 +7873,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22 msgid "NMEA-0183 Files" msgstr "NMEA-0183 檔案" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110 msgid "Coordinates imported: " msgstr "匯入的坐標： " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 msgid "Malformed sentences: " msgstr "格式不良的段落： " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45 msgid "Checksum errors: " msgstr "Checksum 錯誤: " -#. don't scare the user unneccessarily -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 msgid "Unknown sentences: " msgstr "不明的段落： " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 msgid "Zero coordinates: " msgstr "零坐標： " -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54 msgid "NMEA import success" msgstr "NMEA 匯入成功" -#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51 +#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57 msgid "NMEA import faliure!" msgstr "NMEA 匯入失敗！" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82 #, java-format msgid "preference ''{0}'' missing. Can't initialize OsmApi" msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "這個版本的 JOSM 與設定的伺服器。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -7145,15 +7922,15 @@ msgstr "它支援 0.5 和 0.6 版的協定，但是該伺服器說它支援 {0} 到 {1}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}" msgstr "使用 {1} 版協定建立與 {0} 的連線" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237 #, java-format msgid "unexpected format of id replied by the server, got ''{0}''" msgstr "伺服器回覆未預期的 id 格式，取得「{0}」" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261 #, java-format msgid "" @@ -7161,23 +7938,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 msgid "Opening changeset..." msgstr "正在開啓資料組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305 msgid "Closing changeset..." msgstr "正在關閉資料組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327 msgid "No changeset present for diff upload" msgstr "沒有需要進行差異上傳的資料組合" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334 msgid "Preparing..." msgstr "正在準備..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339 msgid "Uploading..." msgstr "正在上傳..." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361 +msgid "Waiting 10 seconds ... " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369 +msgid "OK - trying again." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#, fuzzy, java-format +msgid "Starting retry {0} of {1}." +msgstr "正在掃描目錄 {0}" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -7221,9 +8011,4 @@ msgstr "登入" -#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373 -msgid "Aborting..." -msgstr "正在中止..." - #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17 msgid "OSM Server Files gzip compressed" @@ -7273,66 +8058,70 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214 +msgid "Parsing OSM history data ..." +msgstr "" + #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38 msgid "Error during parse." msgstr "分析時發生錯誤。" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23 msgid "OSM Server Files" msgstr "OSM 伺服器檔案" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147 msgid "Unknown version" msgstr "不明的版本" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150 msgid "Version number missing from OSM data" msgstr "OSM 資料缺少版本編號" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152 #, java-format msgid "Unknown version: {0}" msgstr "不明的版本：{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188 msgid "Found element in non-way." msgstr "在非-路徑中發現 元件。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 msgid " has zero ref" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203 msgid "Found element in non-relation." msgstr "在非-關係中發現 元件。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208 #, java-format msgid "Missing attribute \"ref\" on member in relation {0}" msgstr "在關係 {0} 的成員中缺少屬性「ref」" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212 #, java-format msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}" msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216 #, java-format msgid "Missing attribute \"type\" on member {0} in relation {1}" msgstr "在關係 {1} 的成員 {0} 中缺少屬性「type」" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218 #, java-format msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224 msgid "Incomplete specification with ref=0" msgstr "不完整的 > 規格，ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 msgid "Illegal object with id=0" msgstr "不合法的物件，id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #, java-format msgid "" @@ -7340,51 +8129,84 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302 #, java-format msgid "Missing attribute \"version\" on OSM primitive with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317 #, java-format msgid "Missing required attribute \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 -#, java-format -msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 +#, java-format +msgid "" +"marked way {0} with {1} nodes incomplete because at least one node was " +"missing in the loaded data and is therefore incomplete too" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 msgid "Prepare OSM data..." msgstr "準備 OSM 資料..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478 msgid "Ill-formed node id" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39 +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54 +#, java-format +msgid "id parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72 +#, java-format +msgid "parameter ''{0}'' > 0 required. Got {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 +msgid "Downloading referring ways ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181 +msgid "Downloading referring relations ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 msgid "Downloading history..." msgstr "正在下載歷史紀錄..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28 +#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25 msgid "Contacting Server..." msgstr "正在連接伺服器..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61 #, java-format msgid "Failed to open connection to API {0}" msgstr "開啟 API {0} 連線失敗" -#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75 +#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78 msgid "" "Couldn't connect to the osm server. Please check your internet connection." msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98 +#, java-format +msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" +msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳 {4}: {5} (id: {6})" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#, java-format +msgid "" +"Failed to close changeset {0}, will be closed by server after timeout. " +"Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172 #, java-format msgid "" @@ -7393,16 +8215,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 -#, java-format -msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})" -msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳 {4}: {5} (id: {6})" - #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 msgid "Update Plugins" msgstr "更新外掛程式" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139 msgid "Download Plugins" msgstr "下載外掛程式" @@ -7419,5 +8236,5 @@ " {0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62 #, java-format msgid "{0} Plugin successfully downloaded. Please restart JOSM." @@ -7425,23 +8242,23 @@ msgstr[0] "已成功下載 {0} 個外掛程式。請重新啟動 JOSM。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76 #, java-format msgid "Downloading Plugin {0}..." msgstr "正在下載外掛程式 {0}..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126 msgid "Skip download" msgstr "略過下載" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 #, java-format msgid "JOSM version {0} required for plugin {1}." msgstr "JOSM 第 {0} 版需要外掛程式 {1}。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Download Plugin" msgstr "下載外掛程式" -#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118 +#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128 msgid "Skip Download" msgstr "略過下載" @@ -7452,32 +8269,30 @@ msgstr "外掛程式 {0} 發生錯誤" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65 -#, java-format -msgid "" -"Warning - loading of {0} plugin was requested. This plugin is no longer " -"required." +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71 +#, fuzzy, java-format +msgid "Loading of {0} plugin was requested. This plugin is no longer required." msgstr "警告 - 要求 {0} 外掛程式的載入。這個外掛程式已不再需要。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 #, java-format msgid "Plugin {0} requires JOSM update to version {1}." msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109 #, java-format msgid "Plugin {0} is required by plugin {1} but was not found." msgstr "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124 #, java-format msgid "Plugin not found: {0}." msgstr "找不到外掛程式：{0}。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "上次的外掛程式更新已是 {0} 天前。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143 msgid "" "(You can change the number of days after which this warning appears
by " @@ -7487,21 +8302,21 @@ "warntime」。)" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 msgid "Disable plugin" msgstr "停用外掛程式" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "無法載入外掛程式 {0}。是否從偏好設定中刪除？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178 msgid "Keep plugin" msgstr "保留外掛程式" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221 msgid "" "Activating the updated plugins failed. Check if JOSM has the permission to " @@ -7509,5 +8324,5 @@ msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 #, java-format msgid "" @@ -7515,19 +8330,19 @@ msgstr "發生未預期的例外，可能來自「{0}」外掛程式。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "根據此外掛程式的資訊，作者是 {0}。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "在回報程式錯誤前請先嘗試將外掛程式升級到最新版本。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Should the plugin be disabled?" msgstr "是否停用此外掛程式？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -7535,25 +8350,23 @@ msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271 -msgid "" -"The plugin could not be removed. Please tell the people you got JOSM from " -"about the problem." -msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296 -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37 -msgid "Information" -msgstr "資訊" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312 -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 +msgid "The plugin could not be removed. Probably it was already disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350 +#, fuzzy +msgid "Plugin information" +msgstr "找不到外掛程式資訊。" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171 msgid "no description available" msgstr "沒有描述可用" -#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169 +#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" msgstr "更多詳細資料" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53 #, java-format msgid "Downloaded plugin information from {0} site" @@ -7561,13 +8374,18 @@ msgstr[0] "從 {0} 網站下載的外掛程式資訊" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61 msgid "No plugin information found." msgstr "找不到外掛程式資訊。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#, java-format +msgid "Plug-in named {0} is not available. Update skipped." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94 msgid "All installed plugins are up to date." msgstr "所有已安裝的外掛程式都是最新版。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102 #, java-format msgid "" @@ -7580,9 +8398,9 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137 msgid "Download missing plugins" msgstr "下載缺少的外掛程式" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138 #, java-format msgid "" @@ -7595,57 +8413,35 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169 -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180 -#: build/trans_presets.java:320 build/trans_presets.java:321 -#: build/trans_presets.java:322 build/trans_presets.java:323 -#: build/trans_presets.java:324 build/trans_presets.java:325 -#: build/trans_presets.java:326 build/trans_presets.java:327 -#: build/trans_presets.java:328 build/trans_presets.java:329 -#: build/trans_presets.java:330 build/trans_presets.java:524 -#: build/trans_presets.java:525 build/trans_presets.java:526 -#: build/trans_presets.java:545 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:566 -#: build/trans_presets.java:567 build/trans_presets.java:568 -#: build/trans_presets.java:587 build/trans_presets.java:588 -#: build/trans_presets.java:589 build/trans_presets.java:608 -#: build/trans_presets.java:609 build/trans_presets.java:610 -#: build/trans_presets.java:629 build/trans_presets.java:630 -#: build/trans_presets.java:631 build/trans_presets.java:766 -#: build/trans_presets.java:781 build/trans_presets.java:1314 -#: build/trans_presets.java:1376 -msgid "unknown" -msgstr "不明" - -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213 #, java-format msgid "{0}: Version {1}{2}" msgstr "{0}：版本 {1}{2}" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221 msgid "Plugin bundled with JOSM" msgstr "JOSM 隨附外掛程式" -#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354 #, java-format msgid "Error reading plugin information file: {0}" msgstr "讀取外掛程式資訊檔案時發生錯誤：{0}" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302 msgid "This is after the end of the recording" msgstr "這已在記錄的結尾之後" -#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339 +#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344 msgid "Error playing sound" msgstr "播放音效時發生錯誤" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Do nothing" msgstr "不做任何事" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Report Bug" msgstr "回報程式錯誤" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 msgid "" "An unexpected exception occurred.\n" @@ -7659,18 +8455,18 @@ "最新版 JOSM，請不吝提供程式錯誤回報。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58 msgid "Unexpected Exception" msgstr "未預期的例外" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 #, java-format msgid "Please report a ticket at {0}" msgstr "請在 {0} 回報為 ticket" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70 msgid "Include your steps to get to the error (as detailed as possible)!" msgstr "包含您導致此錯誤的步驟（愈詳細愈好）！" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71 msgid "" "Try updating to the newest version of JOSM and all plugins before reporting " @@ -7678,17 +8474,33 @@ msgstr "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72 msgid "Be sure to include the following information:" msgstr "請確認包含下列資訊：" -#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74 +#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77 msgid "(The text has already been copied to your clipboard.)" msgstr "（該文字已複製到您的剪貼簿中。）" -#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32 -msgid "Do not show again" -msgstr "不再顯示" - -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119 +#, java-format +msgid "Unable to find translation for the locale {0}. Reverting to {1}." +msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181 +#, java-format +msgid "" +"Warning: failed to acccess directory ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201 +#, java-format +msgid "" +"Fatal: failed to locate image ''{0}''. This is a serious configuration " +"problem. JOSM will stop working." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 #, java-format msgid "" @@ -7701,5 +8513,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452 msgid "" "This action will have no shortcut.\n" @@ -7709,5 +8521,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454 #, java-format msgid "" @@ -7718,13 +8530,28 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "（提示：您可以在偏好設定中編輯捷徑鍵。）" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88 +#, java-format +msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61 +#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81 +#, java-format +msgid "" +"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception " +"was: {1}" +msgstr "" + +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "Create grid of ways" msgstr "建立路徑的格線" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 msgid "" "Forms a grid of ways in base to two existing that have various nodes and one " @@ -7732,21 +8559,21 @@ msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 msgid "Select two ways with a node in common" msgstr "選擇兩條有共同節點的路徑" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63 msgid "Select two ways with alone a node in common" msgstr "" -#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103 +#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104 msgid "Create a grid of ways" msgstr "建立路徑的格線" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70 msgid "Upload Trace" msgstr "上傳軌跡" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35 @@ -7754,74 +8581,75 @@ msgstr "上傳軌跡" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98 msgid "Public" msgstr "公開" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99 msgid "Selected makes your trace public in openstreetmap.org" msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開" #. item "Relations/Route" text "Symbol description" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101 #: build/trans_presets.java:3006 msgid "Description" msgstr "描述" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102 msgid "Please enter Description about your trace." msgstr "請輸入您的軌跡的相關描述。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105 msgid "Please enter tags about your trace." msgstr "請輸入您的軌跡的標籤。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150 #, java-format msgid "Selected track: {0}" msgstr "選取的軌跡：{0}" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177 +#. Set progress dialog to indeterminate while connecting +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173 msgid "Connecting..." msgstr "正在連線..." -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196 msgid "Upload cancelled" msgstr "上傳已取消" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206 msgid "Error while uploading" msgstr "上傳時發生錯誤" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260 msgid "GPX upload was successful" msgstr "GPX 上傳成功" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261 msgid "Upload failed. Server returned the following message: " msgstr "上傳失敗。伺服器傳回下列訊息： " -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 #, java-format msgid "Uploading GPX track: {0}% ({1} of {2})" msgstr "正在上傳 GPX 軌跡：{0}% ({1} / {2})" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335 msgid "No description provided. Please provide some description." msgstr "沒有提供描述。請提供一些描述。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339 -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360 msgid "No GPX layer selected. Cannot upload a trace." msgstr "沒有選取 GPX 圖層。不能上傳軌跡。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341 msgid "No username provided." msgstr "沒有提供使用者名稱。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344 msgid "No password provided." msgstr "沒有提供密碼。" -#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377 +#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376 msgid "Uploading GPX Track" msgstr "正在上傳 GPX 軌跡" @@ -7891,33 +8719,34 @@ msgstr "選取的檔案其中之一是空的！！！" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "讀取相片..." -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" msgstr "無法取得目錄 {0} 的路徑\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" msgstr "正在掃描目錄 {0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" msgstr "在目錄 {0} 找到空的檔案\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "從目錄 {0} 取得檔案時發生錯誤\n" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267 msgid "Correlate to GPX" msgstr "關聯到 GPX" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286 #, java-format msgid "{0} were found to be gps tagged." @@ -7937,15 +8766,15 @@ msgstr "GPX 檔案 (*.gpx *.gpx.gz)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" msgstr "檔案 {0} 已經以「{1}」的名稱載入了。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 #, java-format msgid "Error while parsing {0}" msgstr "當解析 {0} 時發生錯誤。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -7956,34 +8785,34 @@ "據您讀取到的相片時刻並選擇時區
" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 msgid "Photo time (from exif):" msgstr "相片時刻 (取自 exif):" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 msgid "Gps time (read from the above photo): " msgstr "Gps 時刻（自上列相片讀取）： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 msgid "I'm in the timezone of: " msgstr "我所在的時區： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 msgid "No date" msgstr "沒有日期" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 msgid "Open an other photo" msgstr "開啟其他相片" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 msgid "Synchronize time from a photo of the GPS receiver" msgstr "從 GPS 接收器的相片同步時間" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 msgid "" "Error while parsing the date.\n" @@ -7993,69 +8822,69 @@ "請使用要求的格式" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 msgid "Invalid date" msgstr "無效的日期" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 msgid "" msgstr "<尚未載入 GPX 軌跡>" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 msgid "GPX track: " msgstr "GPX 軌跡： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 msgid "Open another GPX trace" msgstr "開啟另一個 GPX 軌跡" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 msgid "Timezone: " msgstr "時區： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 msgid "Offset:" msgstr "位移：" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 msgid "I can take a picture of my GPS receiver.
Can this help?" msgstr "我的 GPS 接收器可以拍照。
這樣有幫助嗎？" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 msgid "Update position for: " msgstr "更新位置： " -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 msgid "All images" msgstr "所有圖片" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 msgid "Images with no exif position" msgstr "圖片沒有 exif 位置" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 msgid "Not yet tagged images" msgstr "尚未加上標籤的圖片" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 msgid "Correlate images with GPX track" msgstr "將圖片與 GPX 軌跡關聯" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Correlate" msgstr "關聯" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 msgid "Auto-Guess" msgstr "自動猜測" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "You should select a GPX track" msgstr "您應該選擇一個 GPX 軌跡" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 msgid "No selected GPX track" msgstr "沒有選取的 GPX 軌跡" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 #, java-format msgid "" @@ -8066,9 +8895,9 @@ "預期的格式：{0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 msgid "Invalid timezone" msgstr "無效的時區" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 #, java-format msgid "" @@ -8079,65 +8908,65 @@ "預期的格式：{0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 msgid "Invalid offset" msgstr "無效的移位" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 #, java-format msgid "Found {0} matches of {1} in GPX track {2}" msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 msgid "GPX Track loaded" msgstr "GPX 軌跡已載入" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 msgid "The selected photos don't contain time information." msgstr "選取的相片未包含時刻資訊。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 msgid "Photos don't contain time information" msgstr "相片未包含時刻資訊" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 msgid "" "The selected GPX track doesn't contain timestamps. Please select another one." msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 msgid "GPX Track has no time information" msgstr "GPX 軌跡沒有時刻資訊" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Timezone: {0}" msgstr "時區：{0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 #, java-format msgid "Minutes: {0}" msgstr "分鐘：{0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 #, java-format msgid "Seconds: {0}" msgstr "秒鐘：{0}" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 #, java-format msgid "Matched {0} of {1} photos to GPX track." msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 #, java-format msgid "(Time difference of {0} days)" msgstr "({0} 天的時間差異)" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 #, java-format msgid "Offset between track and photos: {0}m {1}s" msgstr "在軌跡與相片間的補償：{0}分 {1}秒" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -8145,13 +8974,13 @@ msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 msgid "Matching photos to track failed" msgstr "比對相片至軌跡失敗" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Adjust timezone and offset" msgstr "調整時區並補償" -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870 +#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 msgid "Default Values" msgstr "預設值" @@ -8173,5 +9002,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357 msgid "Error loading file" msgstr "載入檔案有錯誤" @@ -8194,6 +9023,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166 msgid "CadastreGrabber: Illegal url." msgstr "CadastreGrabber: 不合法的 url。" @@ -8364,22 +9193,22 @@ msgstr "將「source=...」加入元件？" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21 #, java-format msgid "Downloading {0}" msgstr "正在下載 {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29 msgid "Contacting WMS Server..." msgstr "正在連接 WMS 伺服器..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" msgstr "建立建築" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265 msgid "" "To avoid cadastre WMS overload,\n" @@ -8389,18 +9218,18 @@ "建築匯入的大小限制在最大 1 km2。" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269 -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216 msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 msgid "Extract SVG ViewBox..." msgstr "解開 SVG ViewBox..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67 msgid "Extract best fitting boundary..." msgstr "解出最合適的邊界..." -#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128 msgid "Create boundary" msgstr "建立邊界" @@ -8516,6 +9345,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Blank Layer" msgstr "空白圖層" @@ -8544,5 +9373,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384 #, java-format msgid "" @@ -8553,14 +9382,14 @@ "建立一個新的。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 msgid "Cache Format Error" msgstr "快取格式錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402 msgid "Cache Lambert Zone Error" msgstr "快取蘭勃特區發生錯誤" @@ -8650,4 +9479,9 @@ msgstr "不能重製未排序的路徑。" +#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65 +msgid "No data loaded." +msgstr "沒有載入資料。" + #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126 msgid "You must select at least one way." @@ -8658,9 +9492,9 @@ msgstr "建立重複的路徑" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" msgstr "編輯 GPX 軌跡的圖層" -#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216 +#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" msgstr "轉換為沒有時刻的 GPX 圖層" @@ -8781,30 +9615,30 @@ msgstr "匯入後删除資料" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43 msgid "Importing data from device." msgstr "從裝置匯入資料" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48 msgid "Importing data from DG100..." msgstr "從 DG100 匯入資料..." -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62 msgid "Error deleting data." msgstr "刪除資料時發生錯誤。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68 #, java-format msgid "imported data from {0}" msgstr "資料已從 {0} 匯入" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71 msgid "No data found on device." msgstr "在裝置上找不到資料。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76 msgid "Connection failed." msgstr "連線失敗。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95 msgid "" "Cannot load library rxtxSerial. If you need support to install it try " @@ -8815,14 +9649,14 @@ "raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首頁" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111 -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107 msgid "Globalsat Import" msgstr "Globalsat 匯入" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." msgstr "從 Globalsat Datalogger DG100 匯入資料到 GPX 圖層。" -#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119 +#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113 msgid "Import" msgstr "匯入" @@ -8913,40 +9747,40 @@ msgstr "以 ImageWayPoing 開啟圖片" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78 msgid "Direction index '{0}' not found" msgstr "找不到方向索引「{0}」" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109 msgid "The starting location was not within the bbox" msgstr "開始的位置不在 bbox 內" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114 msgid "Looking for shoreline..." msgstr "尋找海岸線..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146 #, java-format msgid "{0} nodes so far..." msgstr "目前 {0} 個節點..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51 msgid "Lake Walker." msgstr "Lake Walker。" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17 msgid "Lake Walker" msgstr "Lake Walker" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118 #, java-format msgid "Error creating cache directory: {0}" msgstr "建立快取目錄時發生錯誤：{0}" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151 msgid "Tracing" msgstr "正在追蹤" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153 msgid "checking cache..." msgstr "正在檢查快取..." @@ -8955,26 +9789,18 @@ #. * Run the nodelist through a vertex reduction algorithm #. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193 msgid "Running vertex reduction..." msgstr "" -#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain."); -#. * -#. * And then through douglas-peucker approximation -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204 msgid "Running Douglas-Peucker approximation..." msgstr "執行近似 Douglas-Peucker..." -#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain."); -#. * -#. * And then through a duplicate node remover -#. -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215 msgid "Removing duplicate nodes..." msgstr "正在移除重複的節點..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286 -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114 msgid "Lakewalker trace" msgstr "Lakewalker 軌跡" @@ -9059,7 +9885,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:963 build/trans_style.java:980 -#: build/trans_style.java:996 build/trans_style.java:3355 -#: build/trans_style.java:3363 +#: build/trans_style.java:968 build/trans_style.java:985 +#: build/trans_style.java:1001 build/trans_style.java:3360 +#: build/trans_style.java:3368 msgid "water" msgstr "水域" @@ -9208,9 +10034,9 @@ msgstr "Lakewalker 外掛程式偏好設定" -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48 msgid "Downloading image tile..." msgstr "正在下載圖片拼貼..." -#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148 +#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151 msgid "Could not acquire image" msgstr "無法擷取圖片" @@ -9456,18 +10282,18 @@ msgstr "不明的議題狀態" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 msgid "Open Visible..." msgstr "開啟可見的..." -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46 msgid "Open only files that are visible in current view." msgstr "只開啟在目前的檢視中可見的檔案。" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56 msgid "No view open - cannot determine boundaries!" msgstr "沒有開啟檢視 - 不能決定邊界！" -#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110 +#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109 #, java-format msgid "Unknown file extension: {0}" @@ -9492,33 +10318,33 @@ msgstr "Firefox 可執行檔" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 msgid "load data from API" msgstr "從 API 載入資料" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "change the selection" msgstr "改變選擇區域" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "change the viewport" msgstr "改變檢視連接埠" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 msgid "confirm all Remote Control actions manually" msgstr "手動確認所有的遠端控制動作" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 msgid "A plugin that allows JOSM to be controlled from other applications." msgstr "允許 JOSM 被其他應用程式控制的外掛程式。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Remote Control" msgstr "遠端控制" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34 msgid "Settings for the Remote Control plugin." msgstr "遠端控制外掛程式的設定值。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35 msgid "" "The Remote Control plugin will always listen on port 8111 on localhost.The " @@ -9529,28 +10355,28 @@ "照了外部應用程式與此外掛程式的溝通。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40 msgid "Permitted actions" msgstr "准許的動作" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121 msgid "Remote Control has been asked to load data from the API." msgstr "遠端控制被要求自 API 下載資料。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 #, java-format msgid "Request details: {0}" msgstr "要求的詳細資料：{0}" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219 msgid "Do you want to allow this?" msgstr "您是否要允許這個？" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220 msgid "Confirm Remote Control action" msgstr "確認遠端控制動作" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217 msgid "Remote Control has been asked to import data from the following URL:" msgstr "遠端控制被要求自下列 URL 匯入資料：" @@ -9559,13 +10385,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 @@ -9679,5 +10505,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 msgid "image " -msgstr "" +msgstr "圖片 " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9724,5 +10550,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "要求更新發生錯誤：不縮放-等級 12" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -9813,4 +10639,24 @@ msgid "Highlight" msgstr "突顯" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371 +#, java-format +msgid "Updating properties of up to {0} object" +msgid_plural "Updating properties of up to {0} objects" +msgstr[0] "更新 {0} 個物件之多的屬性" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44 +msgid "INFO: entering compatibilty mode for JOSM with Main.ds" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47 +msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" +msgstr "" + +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49 +msgid "" +"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +"found." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17 @@ -10061,33 +10907,33 @@ msgstr "開啟能跳到指定位置的對話盒" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55 msgid "Enter Lat/Lon to jump to position." msgstr "輸入要跳至地點的經/緯。" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57 msgid "You can also paste an URL from www.openstreetmap.org" msgstr "您也可以貼上 www.openstreetmap.org 的 URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89 msgid "Zoom (in metres)" msgstr "縮放（以公尺計）" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92 msgid "URL" msgstr "URL" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95 msgid "Jump there" msgstr "跳至那裡" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102 msgid "Jump to Position" msgstr "跳至位置" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "無法貼上緯度、經度或縮放。請檢查。" -#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113 +#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114 msgid "Unable to parse Lon/Lat" msgstr "無法分析經/緯" @@ -10118,6 +10964,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75 msgid "Validation errors" msgstr "驗證的錯誤" @@ -10127,10 +10973,10 @@ msgstr "沒有驗證上的錯誤" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164 msgid "Grid" msgstr "格線" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286 #, java-format msgid "" @@ -10219,23 +11065,15 @@ msgstr "進行資料驗證" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 msgid "Data with errors. Upload anyway?" msgstr "資料有錯誤。要強制上傳嗎？" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74 msgid "Open the validation window." msgstr "開啟驗證視窗。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81 msgid "Zoom to problem" msgstr "縮放至問題點" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100 -msgid "Validate" -msgstr "檢驗" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101 -msgid "Validate either current selection or complete dataset." -msgstr "檢驗目前的選擇區域或整個資料組合。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102 @@ -10306,22 +11144,22 @@ msgstr "路徑交叉" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53 msgid "Duplicated nodes" msgstr "重複的節點" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36 msgid "This test checks that there are no nodes at the very same location." msgstr "這會測試有沒有位置非常相近的節點存在。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 msgid "Duplicated way nodes." msgstr "重複的路徑節點。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." msgstr "檢查是否有整個節點都相同的路徑。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 msgid "Duplicated way nodes" msgstr "重複的路徑節點" @@ -10394,23 +11232,23 @@ msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 msgid "Properties checker :" msgstr "屬性檢查器：" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151 msgid "This plugin checks for errors in property keys and values." msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282 #, java-format msgid "Invalid tagchecker line - {0}: {1}" msgstr "無效的標籤檢查行- {0}： {1}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 #, java-format msgid "Invalid spellcheck line: {0}" msgstr "無效的拼字檢查行：{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306 #, java-format msgid "" @@ -10421,7 +11259,7 @@ "{0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" msgstr "不合法的標籤/數值組合" @@ -10429,78 +11267,80 @@ #. passing translated text also to original string, as we already #. translated the stuff before. Makes the ignore file language dependend. -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448 msgid "Painting problem" msgstr "繪圖問題" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457 #, java-format msgid "Key ''{0}'' invalid." msgstr "設定鍵「{0}」無效。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" msgstr "標籤沒有數值" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 msgid "Invalid property key" msgstr "無效的屬性設定鍵" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474 msgid "Invalid white space in property key" msgstr "屬性設定鍵中有無效的空白字元" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480 msgid "Property values start or end with white space" msgstr "屬性數值以空白字元開頭或結尾" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486 msgid "Property values contain HTML entity" msgstr "屬性數值含有 HTML 標記" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 #, java-format msgid "Key ''{0}'' not in presets." msgstr "設定鍵「{0}」不在預設組合裡。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514 msgid "Presets do not contain property key" msgstr "預設組合不包含屬性設定鍵" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537 msgid "Presets do not contain property value" msgstr "預設組合不包含屬性數值" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548 msgid "FIXMES" msgstr "FIXMES" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 msgid "Check property keys." msgstr "檢查屬性設定鍵。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Validate that property keys are valid checking against list of words." msgstr "檢查文字清單以驗證屬性設定鍵是有效的。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 msgid "Use complex property checker." msgstr "使用複雜的屬性檢查器。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 msgid "Validate property values and tags using complex rules." msgstr "使用複雜的規則驗證屬性數值。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664 msgid "TagChecker source" msgstr "標籤檢查器來源" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687 msgid "" "The sources (URL or filename) of spell check (see http://wiki.openstreetmap." @@ -10510,82 +11350,82 @@ "openstreetmap.org/index.php/User:JLS/speller）" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 msgid "Add a new source to the list." msgstr "將新的來源加入清單。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 msgid "Edit the selected source." msgstr "編輯選取的來源。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692 msgid "Data sources" msgstr "資料來源" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712 msgid "Check property values." msgstr "檢查屬性數值。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Validate that property values are valid checking against presets." msgstr "驗證屬性數值合於預設組合的要求。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 msgid "Check for FIXMES." msgstr "檢查 FIXMES。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "尋找在任何屬性數值中含有 FIXME 的節點或路徑。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728 msgid "Check for paint notes." msgstr "檢查繪圖筆記。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 msgid "Check if map painting found data errors." msgstr "檢查地圖繪製是否發現資料錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736 msgid "Use default data file." msgstr "使用預設的資料檔案。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737 msgid "Use the default data file (recommended)." msgstr "使用預設的資料檔案（建議值）。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 msgid "Use default tag ignore file." -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 +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:729 +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:730 +#: ../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:824 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839 msgid "Fix properties" msgstr "修正屬性" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960 msgid "Could not find element type" msgstr "找不到元件類型" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find warning level" msgstr "找不到警告等級" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986 #, java-format msgid "Illegal expression ''{0}''" msgstr "不合法的辭句「{0}」" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990 #, java-format msgid "Illegal regular expression ''{0}''" @@ -10730,7 +11570,7 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100 -#: build/trans_style.java:4090 build/trans_style.java:4097 -#: build/trans_style.java:4104 build/trans_style.java:4111 -#: build/trans_style.java:4118 +#: build/trans_style.java:4095 build/trans_style.java:4102 +#: build/trans_style.java:4109 build/trans_style.java:4116 +#: build/trans_style.java:4123 msgid "building" msgstr "建築" @@ -10744,5 +11584,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103 -#: build/trans_style.java:4125 +#: build/trans_style.java:4130 msgid "area" msgstr "區域" @@ -10776,10 +11616,10 @@ msgstr "已連接的路徑結束點靠近其他的路徑" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90 msgid "Untagged and unconnected nodes" msgstr "未加標籤與未連接的節點" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 msgid "This test checks for untagged nodes that are not part of any way." msgstr "這個測試會檢查未加標籤且不屬任何路徑的一部分的節點。" @@ -10833,8 +11673,32 @@ msgstr "反轉的陸地：陸地不在左側" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74 #, java-format msgid "{0}, ..." msgstr "{0}, ..." + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 +msgid "Scanned Map..." +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 +msgid "" +"Display a map that was previously scanned and uploaded to walking-papers.org" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 +msgid "" +"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 +#, java-format +msgid "Could not read information from walking-papers.org the id \"{0}\"" +msgstr "" + +#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 +#, java-format +msgid "Walking Papers: {0}" +msgstr "" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -10845,10 +11709,10 @@ msgstr "在路徑的結尾選擇開始的節點" -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147 msgid "Reached the end of the line" msgstr "到達線條的結尾" #. Three or more ways meeting at this node. Means we have a junction. -#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153 +#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154 msgid "Reached a junction" msgstr "到達交會點" @@ -10917,14 +11781,14 @@ msgstr "WMS 外掛程式求助" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 msgid "Rectified Image..." msgstr "修正的圖片..." -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69 msgid "Download Rectified Images From Various Services" msgstr "從多種服務下載修正的圖片" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71 #, java-format msgid "WMS: {0}" @@ -10935,26 +11799,26 @@ #. Clipboard content gets trimmed, so matching whitespace only ensures that this #. service will never be selected automatically. -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" msgstr "自訂 WMS 連結" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" msgstr "支援的修正器服務：" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" msgstr "參觀首頁" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 msgid "WMS URL or Image ID:" msgstr "WMS URL 或圖片 ID：" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148 -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" msgstr "加入修正的圖片" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 msgid "" "Couldn't match the entered link or id to the selected service. Please try " @@ -10962,5 +11826,5 @@ msgstr "無法將整個連結或 id 與選取的服務進行比對。請再試一次。" -#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199 +#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200 msgid "No valid WMS URL or id" msgstr "沒有有效的 WMS URL 或 id" @@ -10970,5 +11834,5 @@ msgstr "調整選取的 WMS 圖層的位置" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127 #, java-format msgid "" @@ -10979,109 +11843,109 @@ "這可能會導致錯誤的坐標。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 msgid "Automatic downloading" msgstr "自動下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS 圖層 ({0})，於縮放 {1} 下載" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的區域太大。請拉近一點，或是改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231 msgid "Download visible tiles" msgstr "下載可見的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240 msgid "Change resolution" msgstr "改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252 msgid "Reload erroneous tiles" msgstr "重新載入錯誤的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274 msgid "Alpha channel" msgstr "透明色版" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 msgid "Save WMS layer to file" msgstr "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337 msgid "File Format Error" msgstr "檔案格式錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143 msgid "WMS" msgstr "WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156 msgid "Open a blank WMS layer to load data from a file" msgstr "開啓空白 WMS 圖層以便自檔案載入資料" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "WMS Plugin Preferences" msgstr "WMS 外掛程式偏好設定" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40 msgid "Modify list of WMS servers displayed in the WMS plugin menu" msgstr "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Menu Name" msgstr "選單名稱" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41 -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 msgid "WMS URL" msgstr "WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "Menu Name (Default)" msgstr "選單名稱（預設值）" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54 msgid "WMS URL (Default)" msgstr "WMS URL（預設值）" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82 msgid "Enter a menu name and WMS URL" msgstr "輸入選單名稱和 WMS URL" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106 msgid "Copy Default" msgstr "複製預設值" -#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 +#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135 msgid "Downloader:" -msgstr "" +msgstr "下載器：" #. * @@ -11193,11 +12057,16 @@ msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。" +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + #. Plugin grid -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:25 msgid "Provide a background layer that displays a map grid" msgstr "提供顯示地圖格線的背景圖層" #. Plugin ImageWayPoint -#: build/trans_plugins.java:25 +#: build/trans_plugins.java:27 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -11209,10 +12078,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:27 +#: build/trans_plugins.java:29 msgid "Helps vectorizing WMS images." msgstr "協助將 WMS 圖片向量化。" #. Plugin livegps -#: build/trans_plugins.java:29 +#: build/trans_plugins.java:31 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -11220,5 +12089,5 @@ #. Plugin measurement -#: build/trans_plugins.java:31 +#: build/trans_plugins.java:33 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -11230,5 +12099,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:33 +#: build/trans_plugins.java:35 msgid "" "Simulates a click when you do a small and short drag. This is usefull for " @@ -11240,15 +12109,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:35 +#: build/trans_plugins.java:37 msgid "Displays an OpenLayers background image" msgstr "顯示 OpenLayers 背景圖片" #. Plugin openstreetbugs -#: build/trans_plugins.java:37 +#: build/trans_plugins.java:39 msgid "Imports issues from OpenStreetBugs" msgstr "匯入OpenStreetBugs 的議題" #. Plugin openvisible -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:41 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -11256,5 +12125,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:43 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -11262,5 +12131,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:43 +#: build/trans_plugins.java:45 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -11269,15 +12138,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:47 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑膠外觀與感覺。" #. Plugin remotecontrol -#: build/trans_plugins.java:47 +#: build/trans_plugins.java:49 msgid "Let other applications send commands to JOSM." msgstr "讓其他的應用程式傳送指令給 JOSM。" #. Plugin routes -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -11286,10 +12155,10 @@ #. Plugin routing -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "Provides routing capabilities." msgstr "提供路線規畫的功能。" #. Plugin slippymap -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -11299,15 +12168,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:55 +#: build/trans_plugins.java:57 msgid "Allow adding markers/nodes on current gps positions." msgstr "允許在目前的 gps 位置加入標記/節點。" #. Plugin tageditor -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:59 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格線中編輯標籤的對話盒。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -11319,10 +12188,10 @@ #. Plugin terracer -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "Make terraced houses out of single blocks." msgstr "讓連棟房屋能超出單一區塊。" #. Plugin usertools -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Tools to work with authors/users. Selects map data that belongs to selected " @@ -11333,5 +12202,5 @@ #. Plugin utilsplugin -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "" "Several utilities that make your life easier: e.g. simplify way, join areas, " @@ -11340,5 +12209,5 @@ #. Plugin validator -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -11348,11 +12217,18 @@ "籤名稱的拼字檢查。" +#. Plugin walkingpapers +#: build/trans_plugins.java:71 +msgid "" +"Supports downloading tiled, scanned maps from walking-papers.org. This " +"plugin is still under early development and may be buggy." +msgstr "" + #. Plugin waydownloader -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:73 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下載一整組互相聯結的路徑" #. Plugin wmsplugin -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:75 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -12507,58 +13383,6 @@ #. item "Streets/Roundabout" combo "Type" -#. color barrier -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. +#. color motorroad +#. #. #. @@ -12572,6 +13396,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:527 -#: build/trans_style.java:535 +#: build/trans_presets.java:346 build/trans_style.java:532 +#: build/trans_style.java:540 msgid "motorway" msgstr "高速公路" @@ -12597,6 +13421,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:543 -#: build/trans_style.java:551 +#: build/trans_presets.java:346 build/trans_style.java:548 +#: build/trans_style.java:556 msgid "trunk" msgstr "快速道路" @@ -12622,6 +13446,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:559 -#: build/trans_style.java:567 +#: build/trans_presets.java:346 build/trans_style.java:564 +#: build/trans_style.java:572 msgid "primary" msgstr "省道" @@ -12647,6 +13471,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:575 -#: build/trans_style.java:583 +#: build/trans_presets.java:346 build/trans_style.java:580 +#: build/trans_style.java:588 msgid "secondary" msgstr "縣道" @@ -12660,5 +13484,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:591 +#: build/trans_presets.java:346 build/trans_style.java:596 msgid "tertiary" msgstr "鄉道" @@ -12676,5 +13500,5 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:3106 +#: build/trans_presets.java:346 build/trans_style.java:3111 msgid "residential" msgstr "居住的" @@ -12708,6 +13532,6 @@ #. #. -#: build/trans_presets.java:346 build/trans_style.java:647 -#: build/trans_style.java:4183 +#: build/trans_presets.java:346 build/trans_style.java:652 +#: build/trans_style.java:4188 msgid "service" msgstr "巷/弄" @@ -12734,6 +13558,6 @@ #. #. color construction -#: build/trans_presets.java:346 build/trans_style.java:850 -#: build/trans_style.java:3171 build/trans_style.java:3172 +#: build/trans_presets.java:346 build/trans_style.java:855 +#: build/trans_style.java:3176 build/trans_style.java:3177 msgid "construction" msgstr "施工" @@ -12783,5 +13607,5 @@ #. #. -#: build/trans_presets.java:408 build/trans_style.java:868 +#: build/trans_presets.java:408 build/trans_style.java:873 msgid "roundabout" msgstr "圓環" @@ -13057,5 +13881,5 @@ #: build/trans_presets.java:728 msgid "Difficult Alpine Hiking" -msgstr "較難的高山健行" +msgstr "艱難的高山健行" #. item @@ -13065,5 +13889,5 @@ #: build/trans_presets.java:732 msgid "Edit Difficult Alpine Hiking" -msgstr "編輯較難的高山健行" +msgstr "編輯艱難的高山健行" #. item "Ways/Difficult Alpine Hiking" text "Width (meters)" @@ -13760,5 +14584,5 @@ #. #. -#: build/trans_presets.java:1119 build/trans_style.java:3347 +#: build/trans_presets.java:1119 build/trans_style.java:3352 msgid "marsh" msgstr "" @@ -15489,27 +16313,27 @@ #: build/trans_presets.java:1800 build/trans_presets.java:1809 #: build/trans_presets.java:1818 build/trans_presets.java:1827 -#: build/trans_style.java:3527 build/trans_style.java:3535 -#: build/trans_style.java:3543 build/trans_style.java:3551 -#: build/trans_style.java:3559 build/trans_style.java:3567 -#: build/trans_style.java:3575 build/trans_style.java:3583 -#: build/trans_style.java:3591 build/trans_style.java:3599 -#: build/trans_style.java:3607 build/trans_style.java:3615 -#: build/trans_style.java:3623 build/trans_style.java:3631 -#: build/trans_style.java:3639 build/trans_style.java:3647 -#: build/trans_style.java:3655 build/trans_style.java:3663 -#: build/trans_style.java:3671 build/trans_style.java:3679 -#: build/trans_style.java:3687 build/trans_style.java:3695 -#: build/trans_style.java:3703 build/trans_style.java:3711 -#: build/trans_style.java:3719 build/trans_style.java:3727 -#: build/trans_style.java:3735 build/trans_style.java:3743 -#: build/trans_style.java:3751 build/trans_style.java:3759 -#: build/trans_style.java:3767 build/trans_style.java:3775 -#: build/trans_style.java:3783 build/trans_style.java:3791 -#: build/trans_style.java:3799 build/trans_style.java:3807 -#: build/trans_style.java:3815 build/trans_style.java:3823 -#: build/trans_style.java:3831 build/trans_style.java:3839 -#: build/trans_style.java:3847 build/trans_style.java:3855 -#: build/trans_style.java:3863 build/trans_style.java:3871 -#: build/trans_style.java:3879 +#: build/trans_style.java:3532 build/trans_style.java:3540 +#: build/trans_style.java:3548 build/trans_style.java:3556 +#: build/trans_style.java:3564 build/trans_style.java:3572 +#: build/trans_style.java:3580 build/trans_style.java:3588 +#: build/trans_style.java:3596 build/trans_style.java:3604 +#: build/trans_style.java:3612 build/trans_style.java:3620 +#: build/trans_style.java:3628 build/trans_style.java:3636 +#: build/trans_style.java:3644 build/trans_style.java:3652 +#: build/trans_style.java:3660 build/trans_style.java:3668 +#: build/trans_style.java:3676 build/trans_style.java:3684 +#: build/trans_style.java:3692 build/trans_style.java:3700 +#: build/trans_style.java:3708 build/trans_style.java:3716 +#: build/trans_style.java:3724 build/trans_style.java:3732 +#: build/trans_style.java:3740 build/trans_style.java:3748 +#: build/trans_style.java:3756 build/trans_style.java:3764 +#: build/trans_style.java:3772 build/trans_style.java:3780 +#: build/trans_style.java:3788 build/trans_style.java:3796 +#: build/trans_style.java:3804 build/trans_style.java:3812 +#: build/trans_style.java:3820 build/trans_style.java:3828 +#: build/trans_style.java:3836 build/trans_style.java:3844 +#: build/trans_style.java:3852 build/trans_style.java:3860 +#: build/trans_style.java:3868 build/trans_style.java:3876 +#: build/trans_style.java:3884 msgid "sport" msgstr "運動" @@ -16879,5 +17703,5 @@ #: build/trans_presets.java:2310 msgid "Amenities" -msgstr "" +msgstr "便利設施" #. group "Amenities" @@ -16995,5 +17819,5 @@ #: build/trans_presets.java:2350 msgid "Bench" -msgstr "" +msgstr "長椅" #. item @@ -17040,5 +17864,5 @@ #: build/trans_presets.java:2362 msgid "Fountain" -msgstr "" +msgstr "噴泉" #. item @@ -17047,10 +17871,10 @@ #: build/trans_presets.java:2365 msgid "Edit Fountain" -msgstr "" +msgstr "編輯噴泉" #. item "Amenities/Fountain" text "Name" #: build/trans_presets.java:2369 msgid "Drinking Water" -msgstr "" +msgstr "飲水機" #. item @@ -17059,5 +17883,5 @@ #: build/trans_presets.java:2372 msgid "Edit Drinking Water" -msgstr "" +msgstr "編輯飲水機" #. item "Amenities/Drinking Water" text "Name" @@ -17075,20 +17899,20 @@ #: build/trans_presets.java:2384 msgid "Shops" -msgstr "" +msgstr "商店" #. group "Shops" #: build/trans_presets.java:2385 msgid "Supermarket" -msgstr "" +msgstr "超級市場" #. item #: build/trans_presets.java:2386 msgid "Edit Supermarket" -msgstr "" +msgstr "編輯超級市場" #. item "Shops/Supermarket" text "Name" #: build/trans_presets.java:2390 msgid "Convenience Store" -msgstr "" +msgstr "便利商店" #. item @@ -17096,5 +17920,5 @@ #: build/trans_presets.java:2392 msgid "Edit Convenience Store" -msgstr "" +msgstr "編輯便利商店" #. item "Shops/Convenience Store" text "Name" @@ -17112,5 +17936,5 @@ #: build/trans_presets.java:2402 msgid "Vending machine" -msgstr "" +msgstr "自動販賣機" #. item @@ -17118,5 +17942,5 @@ #: build/trans_presets.java:2404 msgid "Edit Vending machine" -msgstr "" +msgstr "編輯自動販賣機" #. item "Shops/Vending machine" label "Edit Vending machine" @@ -17124,5 +17948,5 @@ #: build/trans_presets.java:2406 msgid "Vending products" -msgstr "" +msgstr "販賣產品" #. item "Shops/Vending machine" combo "Vending products" @@ -17141,41 +17965,41 @@ #: build/trans_presets.java:2406 msgid "food" -msgstr "" +msgstr "食物" #: build/trans_presets.java:2406 msgid "drinks" -msgstr "" +msgstr "飲料" #: build/trans_presets.java:2406 msgid "sweets" -msgstr "" +msgstr "甜點" #: build/trans_presets.java:2406 msgid "cigarettes" -msgstr "" +msgstr "菸" #: build/trans_presets.java:2406 msgid "photos" -msgstr "" +msgstr "相片" #: build/trans_presets.java:2406 msgid "animal_food" -msgstr "" +msgstr "飼料" #: build/trans_presets.java:2406 msgid "news_papers" -msgstr "" +msgstr "報紙" #: build/trans_presets.java:2406 msgid "toys" -msgstr "" +msgstr "玩具" #: build/trans_presets.java:2406 msgid "stamps" -msgstr "" +msgstr "郵票" #: build/trans_presets.java:2406 msgid "SIM-cards" -msgstr "" +msgstr "SIM-卡" #: build/trans_presets.java:2406 @@ -17189,5 +18013,5 @@ #: build/trans_presets.java:2406 msgid "condoms" -msgstr "" +msgstr "保險套" #: build/trans_presets.java:2406 @@ -17207,5 +18031,5 @@ #: build/trans_presets.java:2417 msgid "Butcher" -msgstr "" +msgstr "肉類" #. item @@ -17213,10 +18037,10 @@ #: build/trans_presets.java:2419 msgid "Edit Butcher" -msgstr "" +msgstr "編輯肉店" #. item "Shops/Butcher" text "Name" #: build/trans_presets.java:2423 msgid "Baker" -msgstr "" +msgstr "麵包類" #. item @@ -17224,10 +18048,10 @@ #: build/trans_presets.java:2425 msgid "Edit Baker" -msgstr "" +msgstr "編輯麵包店" #. item "Shops/Baker" text "Name" #: build/trans_presets.java:2429 msgid "Florist" -msgstr "" +msgstr "花類" #. item @@ -17235,20 +18059,20 @@ #: build/trans_presets.java:2431 msgid "Edit Florist" -msgstr "" +msgstr "編輯花店" #. item "Shops/Florist" text "Name" #: build/trans_presets.java:2435 msgid "Organic" -msgstr "" +msgstr "有機產品" #. item #: build/trans_presets.java:2436 msgid "Edit Organic Shop" -msgstr "" +msgstr "編輯有機產品商店" #. item "Shops/Organic" text "Name" #: build/trans_presets.java:2440 msgid "Alcohol" -msgstr "" +msgstr "酒類" #. item @@ -17256,60 +18080,60 @@ #: build/trans_presets.java:2442 msgid "Edit Alcohol Shop" -msgstr "" +msgstr "編輯賣酒的商店" #. item "Shops/Alcohol" text "Name" #: build/trans_presets.java:2446 msgid "Beverages" -msgstr "" +msgstr "飲料類" #. item #: build/trans_presets.java:2447 msgid "Edit Beverages Shop" -msgstr "" +msgstr "編輯飲料店" #. item "Shops/Beverages" text "Name" #: build/trans_presets.java:2451 msgid "Computer" -msgstr "" +msgstr "電腦類" #. item #: build/trans_presets.java:2452 msgid "Edit Computer Shop" -msgstr "" +msgstr "編輯電腦商店" #. item "Shops/Computer" text "Name" #: build/trans_presets.java:2456 msgid "Electronics" -msgstr "" +msgstr "電子材料" #. item #: build/trans_presets.java:2457 msgid "Edit Electronics Shop" -msgstr "" +msgstr "編輯電子材料行" #. item "Shops/Electronics" text "Name" #: build/trans_presets.java:2461 msgid "Hifi" -msgstr "" +msgstr "Hifi" #. item #: build/trans_presets.java:2462 msgid "Edit Hifi Shop" -msgstr "" +msgstr "編輯 Hifi 音響店" #. item "Shops/Hifi" text "Name" #: build/trans_presets.java:2466 msgid "Furniture" -msgstr "" +msgstr "傢俱類" #. item #: build/trans_presets.java:2467 msgid "Edit Furniture Shop" -msgstr "" +msgstr "編輯傢俱店" #. item "Shops/Furniture" text "Name" #: build/trans_presets.java:2471 msgid "Garden Centre" -msgstr "" +msgstr "園藝中心" #. item @@ -17317,5 +18141,5 @@ #: build/trans_presets.java:2473 msgid "Edit Garden Centre" -msgstr "" +msgstr "編輯園藝中心" #. item "Shops/Garden Centre" text "Name" @@ -17333,5 +18157,5 @@ #: build/trans_presets.java:2483 msgid "Do-it-yourself-store" -msgstr "" +msgstr "DIY 商店" #. item @@ -17339,60 +18163,60 @@ #: build/trans_presets.java:2485 msgid "Edit Do-it-yourself-store" -msgstr "" +msgstr "編輯 DIY 商店" #. item "Shops/Do-it-yourself-store" text "Name" #: build/trans_presets.java:2489 msgid "Stationery" -msgstr "" +msgstr "文具類" #. item #: build/trans_presets.java:2490 msgid "Edit Stationery Shop" -msgstr "" +msgstr "編輯文具店" #. item "Shops/Stationery" text "Name" #: build/trans_presets.java:2494 msgid "Hairdresser" -msgstr "" +msgstr "美髮類" #. item #: build/trans_presets.java:2495 msgid "Edit Hairdresser" -msgstr "" +msgstr "編輯美髮店" #. item "Shops/Hairdresser" text "Name" #: build/trans_presets.java:2499 msgid "Shoes" -msgstr "" +msgstr "鞋類" #. item #: build/trans_presets.java:2500 msgid "Edit Shoe Shop" -msgstr "" +msgstr "編輯鞋店" #. item "Shops/Shoes" text "Name" #: build/trans_presets.java:2504 msgid "Toys" -msgstr "" +msgstr "玩具類" #. item #: build/trans_presets.java:2505 msgid "Edit Toy Shop" -msgstr "" +msgstr "編輯玩具店" #. item "Shops/Toys" text "Name" #: build/trans_presets.java:2509 msgid "Video" -msgstr "" +msgstr "影片類" #. item #: build/trans_presets.java:2510 msgid "Edit Video Shop" -msgstr "" +msgstr "編輯影片類商店" #. item "Shops/Video" text "Name" #: build/trans_presets.java:2514 msgid "Dry Cleaning" -msgstr "" +msgstr "乾洗類" #. item @@ -17400,10 +18224,10 @@ #: build/trans_presets.java:2516 msgid "Edit Dry Cleaning" -msgstr "" +msgstr "編輯乾洗店" #. item "Shops/Dry Cleaning" text "Name" #: build/trans_presets.java:2520 msgid "Laundry" -msgstr "" +msgstr "洗衣店" #. item @@ -17411,10 +18235,10 @@ #: build/trans_presets.java:2522 msgid "Edit Laundry" -msgstr "" +msgstr "編輯洗衣店" #. item "Shops/Laundry" text "Name" #: build/trans_presets.java:2526 msgid "Outdoor" -msgstr "" +msgstr "戶外用品" #. item @@ -17422,35 +18246,35 @@ #: build/trans_presets.java:2528 msgid "Edit Outdoor Shop" -msgstr "" +msgstr "編輯戶外用品店" #. item "Shops/Outdoor" text "Name" #: build/trans_presets.java:2532 msgid "Sports" -msgstr "" +msgstr "運動用品" #. item #: build/trans_presets.java:2533 msgid "Edit Sports Shop" -msgstr "" +msgstr "編輯運動用品店" #. item "Shops/Sports" text "Name" #: build/trans_presets.java:2537 msgid "Optician" -msgstr "" +msgstr "眼鏡類" #. item #: build/trans_presets.java:2538 msgid "Edit Optician" -msgstr "" +msgstr "編輯眼鏡行" #. item "Shops/Optician" text "Name" #: build/trans_presets.java:2544 msgid "Cash" -msgstr "" +msgstr "現金" #. group "Cash" #: build/trans_presets.java:2545 msgid "Bank" -msgstr "" +msgstr "銀行" #. item @@ -17458,5 +18282,5 @@ #: build/trans_presets.java:2547 msgid "Edit Bank" -msgstr "" +msgstr "編輯銀行" #. item "Cash/Bank" text "Name" @@ -17464,5 +18288,5 @@ #: build/trans_presets.java:2550 build/trans_presets.java:2558 msgid "Automated Teller Machine" -msgstr "" +msgstr "自動提款機(ATM)" #. item "Cash/Bank" check "Automated Teller Machine" @@ -17481,15 +18305,15 @@ #: build/trans_presets.java:2560 msgid "Edit Automated Teller Machine" -msgstr "" +msgstr "編輯自動提款機" #. item "Cash/Automated Teller Machine" text "Operator" #: build/trans_presets.java:2565 msgid "Health" -msgstr "" +msgstr "健康" #. group "Health" #: build/trans_presets.java:2566 msgid "Doctors" -msgstr "" +msgstr "醫師" #. item @@ -17497,20 +18321,20 @@ #: build/trans_presets.java:2568 msgid "Edit Doctors" -msgstr "" +msgstr "編輯醫師" #. item "Health/Doctors" text "Name" #: build/trans_presets.java:2572 msgid "Dentist" -msgstr "" +msgstr "牙醫" #. item #: build/trans_presets.java:2573 msgid "Edit Dentist" -msgstr "" +msgstr "編輯牙醫" #. item "Health/Dentist" text "Name" #: build/trans_presets.java:2577 msgid "Pharmacy" -msgstr "" +msgstr "藥局" #. item @@ -17518,5 +18342,5 @@ #: build/trans_presets.java:2579 msgid "Edit Pharmacy" -msgstr "" +msgstr "編輯藥局" #. item "Health/Pharmacy" label "Edit Pharmacy" @@ -17524,10 +18348,10 @@ #: build/trans_presets.java:2581 msgid "Dispensing" -msgstr "" +msgstr "配藥" #. item "Health/Pharmacy" text "Name" #: build/trans_presets.java:2584 msgid "Hospital" -msgstr "" +msgstr "醫院" #. item @@ -17535,5 +18359,5 @@ #: build/trans_presets.java:2586 msgid "Edit Hospital" -msgstr "" +msgstr "編輯醫院" #. item "Health/Hospital" text "Name" @@ -17564,10 +18388,10 @@ #: build/trans_presets.java:2599 msgid "Phone Number" -msgstr "" +msgstr "電話號碼" #. item "Health/Emergency Access Point" text "Phone Number" #: build/trans_presets.java:2600 msgid "(Use international code, like +12-345-67890)" -msgstr "" +msgstr "(使用國際碼，像是 +12-345-67890)" #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" @@ -17575,5 +18399,5 @@ #: build/trans_presets.java:2603 msgid "Veterinary" -msgstr "" +msgstr "獸醫" #. item @@ -17582,5 +18406,5 @@ #: build/trans_presets.java:2606 msgid "Edit Veterinary" -msgstr "" +msgstr "編輯獸醫" #. group "Places" @@ -17628,10 +18452,10 @@ #: build/trans_presets.java:2637 msgid "County" -msgstr "" +msgstr "縣" #. item #: build/trans_presets.java:2638 msgid "Edit County" -msgstr "" +msgstr "編輯縣" #. item "Places/County" text "Name" @@ -17639,15 +18463,15 @@ #: build/trans_presets.java:2644 msgid "City" -msgstr "城市" +msgstr "市" #. item #: build/trans_presets.java:2645 msgid "Edit City" -msgstr "" +msgstr "編輯市" #. item "Places/City" text "Name" #: build/trans_presets.java:2650 msgid "Town" -msgstr "" +msgstr "鄉/鎮" #. item @@ -17655,10 +18479,10 @@ #: build/trans_presets.java:2652 msgid "Edit Town" -msgstr "" +msgstr "編輯鄉/鎮" #. item "Places/Town" text "Name" #: build/trans_presets.java:2657 msgid "Suburb" -msgstr "" +msgstr "郊區" #. item @@ -17666,15 +18490,15 @@ #: build/trans_presets.java:2659 msgid "Edit Suburb" -msgstr "" +msgstr "編輯郊區" #. item "Places/Suburb" text "Name" #: build/trans_presets.java:2664 msgid "Village" -msgstr "" +msgstr "村/里" #. item #: build/trans_presets.java:2665 msgid "Edit Village" -msgstr "" +msgstr "編輯村/里" #. item "Places/Village" text "Name" @@ -17703,5 +18527,5 @@ #: build/trans_presets.java:2684 msgid "Island" -msgstr "" +msgstr "島嶼" #. item @@ -17709,5 +18533,5 @@ #: build/trans_presets.java:2686 msgid "Edit Island" -msgstr "" +msgstr "編輯島嶼" #. item "Places/Island" text "Name" @@ -17715,5 +18539,5 @@ #: build/trans_presets.java:2692 msgid "Cave Entrance" -msgstr "" +msgstr "洞窟入口" #. item @@ -17721,10 +18545,10 @@ #: build/trans_presets.java:2694 msgid "Edit Cave Entrance" -msgstr "" +msgstr "編輯洞窟入口" #. item "Places/Cave Entrance" text "Name" #: build/trans_presets.java:2698 msgid "Peak" -msgstr "" +msgstr "峰" #. item @@ -17732,10 +18556,10 @@ #: build/trans_presets.java:2700 msgid "Edit Peak" -msgstr "" +msgstr "編輯山峰" #. item "Places/Peak" text "Elevation" #: build/trans_presets.java:2705 msgid "Glacier" -msgstr "" +msgstr "冰河" #. item @@ -17743,10 +18567,10 @@ #: build/trans_presets.java:2707 msgid "Edit Glacier" -msgstr "" +msgstr "編輯冰河" #. item "Places/Glacier" text "Elevation" #: build/trans_presets.java:2712 msgid "Volcano" -msgstr "" +msgstr "火山" #. item @@ -17754,70 +18578,70 @@ #: build/trans_presets.java:2714 msgid "Edit Volcano" -msgstr "" +msgstr "編輯火山" #. item "Places/Volcano" text "Elevation" #: build/trans_presets.java:2720 msgid "Boundaries" -msgstr "" +msgstr "邊界" #. group "Boundaries" #: build/trans_presets.java:2721 msgid "National" -msgstr "" +msgstr "國界" #. item #: build/trans_presets.java:2722 msgid "Edit National Boundary" -msgstr "" +msgstr "編輯國界" #. item "Boundaries/National" text "Name" #: build/trans_presets.java:2727 msgid "Administrative" -msgstr "" +msgstr "行政區" #. item #: build/trans_presets.java:2728 msgid "Edit Administrative Boundary" -msgstr "" +msgstr "編輯行政區邊界" #. item "Boundaries/Administrative" text "Name" #: build/trans_presets.java:2733 msgid "Civil" -msgstr "" +msgstr "城市的" #. item #: build/trans_presets.java:2734 msgid "Edit Civil Boundary" -msgstr "" +msgstr "編輯城市邊界" #. item "Boundaries/Civil" text "Name" #: build/trans_presets.java:2739 msgid "Political" -msgstr "" +msgstr "政治的" #. item #: build/trans_presets.java:2740 msgid "Edit Political Boundary" -msgstr "" +msgstr "編輯政治的邊界" #. item "Boundaries/Political" text "Name" #: build/trans_presets.java:2745 msgid "National park" -msgstr "" +msgstr "國家公園" #. item #: build/trans_presets.java:2746 msgid "Edit National Park Boundary" -msgstr "" +msgstr "編輯國家公園" #. item "Boundaries/National park" text "Name" #: build/trans_presets.java:2752 msgid "Land use" -msgstr "" +msgstr "土地利用" #. group "Land use" #: build/trans_presets.java:2753 msgid "Tree" -msgstr "" +msgstr "樹" #. item @@ -17826,10 +18650,10 @@ #: build/trans_presets.java:2756 msgid "Edit Tree" -msgstr "" +msgstr "編輯樹" #. item "Land use/Tree" text "Height" #: build/trans_presets.java:2761 msgid "Botanical Name" -msgstr "" +msgstr "植物學名" #. item "Land use/Tree" text "Botanical Name" @@ -17849,17 +18673,17 @@ #: build/trans_presets.java:2769 build/trans_presets.java:2778 msgid "coniferous" -msgstr "" +msgstr "松類" #: build/trans_presets.java:2769 build/trans_presets.java:2778 msgid "deciduous" -msgstr "" +msgstr "落葉類" #: build/trans_presets.java:2769 build/trans_presets.java:2778 msgid "mixed" -msgstr "" +msgstr "混合" #: build/trans_presets.java:2771 msgid "Forest" -msgstr "" +msgstr "森林" #. item @@ -17868,14 +18692,14 @@ #: build/trans_presets.java:2774 msgid "Edit Forest Landuse" -msgstr "" +msgstr "編輯森林土地利用" #: build/trans_presets.java:2780 msgid "Nature Reserve" -msgstr "" +msgstr "自然保育" #. item #: build/trans_presets.java:2781 msgid "Edit Nature Reserve" -msgstr "" +msgstr "編輯自然保育" #. item "Land use/Nature Reserve" text "Name" @@ -17979,15 +18803,15 @@ #: build/trans_presets.java:2842 msgid "Garden" -msgstr "" +msgstr "花園" #. item #: build/trans_presets.java:2843 msgid "Edit Garden" -msgstr "" +msgstr "編輯花園" #. item "Land use/Garden" text "Name" #: build/trans_presets.java:2847 msgid "Grass" -msgstr "" +msgstr "草地" #. item @@ -18348,7 +19172,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:224 -#: build/trans_style.java:663 build/trans_style.java:879 -#: build/trans_style.java:887 build/trans_style.java:895 -#: build/trans_style.java:903 build/trans_style.java:911 +#: build/trans_style.java:668 build/trans_style.java:884 +#: build/trans_style.java:892 build/trans_style.java:900 +#: build/trans_style.java:908 build/trans_style.java:916 msgid "bicycle" msgstr "單車" @@ -18418,7 +19242,7 @@ #. #: build/trans_presets.java:3002 build/trans_style.java:238 -#: build/trans_style.java:671 build/trans_style.java:679 -#: build/trans_style.java:687 build/trans_style.java:688 -#: build/trans_style.java:696 +#: build/trans_style.java:676 build/trans_style.java:684 +#: build/trans_style.java:692 build/trans_style.java:693 +#: build/trans_style.java:701 msgid "foot" msgstr "" @@ -18426,5 +19250,5 @@ #: build/trans_presets.java:3002 msgid "hiking" -msgstr "" +msgstr "健行" #: build/trans_presets.java:3002 @@ -18444,5 +19268,5 @@ #. #. -#: build/trans_presets.java:3002 build/trans_style.java:1179 +#: build/trans_presets.java:3002 build/trans_style.java:1184 msgid "subway" msgstr "" @@ -18933,13 +19757,13 @@ #: build/trans_style.java:130 build/trans_style.java:165 #: build/trans_style.java:172 build/trans_style.java:179 -#: build/trans_style.java:607 build/trans_style.java:804 -#: build/trans_style.java:1129 build/trans_style.java:2386 -#: build/trans_style.java:3338 build/trans_style.java:3339 -#: build/trans_style.java:3893 build/trans_style.java:4193 -#: build/trans_style.java:4202 build/trans_style.java:4211 -#: build/trans_style.java:4220 build/trans_style.java:4229 -#: build/trans_style.java:4238 build/trans_style.java:4247 -#: build/trans_style.java:4248 build/trans_style.java:4257 -#: build/trans_style.java:4266 +#: build/trans_style.java:612 build/trans_style.java:809 +#: build/trans_style.java:1134 build/trans_style.java:2391 +#: build/trans_style.java:3343 build/trans_style.java:3344 +#: build/trans_style.java:3898 build/trans_style.java:4198 +#: build/trans_style.java:4207 build/trans_style.java:4216 +#: build/trans_style.java:4225 build/trans_style.java:4234 +#: build/trans_style.java:4243 build/trans_style.java:4252 +#: build/trans_style.java:4253 build/trans_style.java:4262 +#: build/trans_style.java:4271 msgid "deprecated" msgstr "" @@ -18981,5 +19805,5 @@ #. #. -#: build/trans_style.java:266 build/trans_style.java:655 +#: build/trans_style.java:266 build/trans_style.java:660 msgid "horse" msgstr "" @@ -19199,4 +20023,66 @@ msgstr "" +#. color barrier +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#: build/trans_style.java:527 +#, fuzzy +msgid "motorroad" +msgstr "汽車專用" + #. color tertiary #. @@ -19231,6 +20117,6 @@ #. #. -#: build/trans_style.java:599 build/trans_style.java:615 -#: build/trans_style.java:631 build/trans_style.java:639 +#: build/trans_style.java:604 build/trans_style.java:620 +#: build/trans_style.java:636 build/trans_style.java:644 msgid "street" msgstr "" @@ -19286,7 +20172,7 @@ #. #. -#: build/trans_style.java:623 build/trans_style.java:921 -#: build/trans_style.java:929 build/trans_style.java:937 -#: build/trans_style.java:945 build/trans_style.java:953 +#: build/trans_style.java:628 build/trans_style.java:926 +#: build/trans_style.java:934 build/trans_style.java:942 +#: build/trans_style.java:950 build/trans_style.java:958 msgid "highway_track" msgstr "" @@ -19342,8 +20228,8 @@ #. #. color rail -#: build/trans_style.java:704 build/trans_style.java:1153 -#: build/trans_style.java:1217 build/trans_style.java:1225 -#: build/trans_style.java:1234 build/trans_style.java:1242 -#: build/trans_style.java:1243 +#: build/trans_style.java:709 build/trans_style.java:1158 +#: build/trans_style.java:1222 build/trans_style.java:1230 +#: build/trans_style.java:1239 build/trans_style.java:1247 +#: build/trans_style.java:1248 msgid "rail" msgstr "" @@ -19364,5 +20250,5 @@ #. #. -#: build/trans_style.java:819 +#: build/trans_style.java:824 msgid "services" msgstr "" @@ -19376,5 +20262,5 @@ #. #. -#: build/trans_style.java:827 +#: build/trans_style.java:832 msgid "ford" msgstr "" @@ -19395,5 +20281,5 @@ #. #. -#: build/trans_style.java:842 +#: build/trans_style.java:847 msgid "turningcircle" msgstr "" @@ -19408,5 +20294,5 @@ #. #. -#: build/trans_style.java:859 +#: build/trans_style.java:864 msgid "emergency_access_point" msgstr "" @@ -19421,5 +20307,5 @@ #. #. color riverbank -#: build/trans_style.java:971 build/trans_style.java:972 +#: build/trans_style.java:976 build/trans_style.java:977 msgid "riverbank" msgstr "" @@ -19433,5 +20319,5 @@ #. #. -#: build/trans_style.java:988 +#: build/trans_style.java:993 msgid "stream" msgstr "" @@ -19445,5 +20331,5 @@ #. #. -#: build/trans_style.java:1004 +#: build/trans_style.java:1009 msgid "dock" msgstr "" @@ -19471,5 +20357,5 @@ #. #. -#: build/trans_style.java:1026 +#: build/trans_style.java:1031 msgid "aqueduct" msgstr "" @@ -19637,13 +20523,13 @@ #. #. -#: build/trans_style.java:1035 build/trans_style.java:1064 -#: build/trans_style.java:1072 build/trans_style.java:1073 -#: build/trans_style.java:1081 build/trans_style.java:1521 -#: build/trans_style.java:1528 build/trans_style.java:1537 -#: build/trans_style.java:1545 build/trans_style.java:1570 -#: build/trans_style.java:1578 build/trans_style.java:1586 -#: build/trans_style.java:1594 build/trans_style.java:1601 -#: build/trans_style.java:1610 build/trans_style.java:1618 -#: build/trans_style.java:1626 build/trans_style.java:1634 +#: build/trans_style.java:1040 build/trans_style.java:1069 +#: build/trans_style.java:1077 build/trans_style.java:1078 +#: build/trans_style.java:1086 build/trans_style.java:1526 +#: build/trans_style.java:1533 build/trans_style.java:1542 +#: build/trans_style.java:1550 build/trans_style.java:1575 +#: build/trans_style.java:1583 build/trans_style.java:1591 +#: build/trans_style.java:1599 build/trans_style.java:1606 +#: build/trans_style.java:1615 build/trans_style.java:1623 +#: build/trans_style.java:1631 build/trans_style.java:1639 msgid "manmade" msgstr "" @@ -19705,7 +20591,7 @@ #. #. -#: build/trans_style.java:1091 build/trans_style.java:1106 -#: build/trans_style.java:1121 build/trans_style.java:1137 -#: build/trans_style.java:1145 +#: build/trans_style.java:1096 build/trans_style.java:1111 +#: build/trans_style.java:1126 build/trans_style.java:1142 +#: build/trans_style.java:1150 msgid "railwaypoint" msgstr "" @@ -19728,10 +20614,10 @@ #. #. -#: build/trans_style.java:1162 build/trans_style.java:1171 +#: build/trans_style.java:1167 build/trans_style.java:1176 msgid "otherrail" msgstr "" #. color otherrail -#: build/trans_style.java:1163 +#: build/trans_style.java:1168 msgid "railover" msgstr "" @@ -19767,7 +20653,7 @@ #. #. color oldrail -#: build/trans_style.java:1187 build/trans_style.java:1197 -#: build/trans_style.java:1198 build/trans_style.java:1208 -#: build/trans_style.java:1209 +#: build/trans_style.java:1192 build/trans_style.java:1202 +#: build/trans_style.java:1203 build/trans_style.java:1213 +#: build/trans_style.java:1214 msgid "oldrail" msgstr "" @@ -19812,6 +20698,6 @@ #. #. -#: build/trans_style.java:1273 build/trans_style.java:1274 -#: build/trans_style.java:1306 +#: build/trans_style.java:1278 build/trans_style.java:1279 +#: build/trans_style.java:1311 msgid "aeroway" msgstr "" @@ -19825,5 +20711,5 @@ #. #. -#: build/trans_style.java:1282 +#: build/trans_style.java:1287 msgid "terminal" msgstr "" @@ -19845,5 +20731,5 @@ #. #. -#: build/trans_style.java:1290 build/trans_style.java:1298 +#: build/trans_style.java:1295 build/trans_style.java:1303 msgid "aeroway_dark" msgstr "" @@ -19857,5 +20743,5 @@ #. #. -#: build/trans_style.java:1314 +#: build/trans_style.java:1319 msgid "aeroway_light" msgstr "" @@ -19903,7 +20789,7 @@ #. #. -#: build/trans_style.java:1324 build/trans_style.java:1332 -#: build/trans_style.java:1340 build/trans_style.java:1348 -#: build/trans_style.java:1356 +#: build/trans_style.java:1329 build/trans_style.java:1337 +#: build/trans_style.java:1345 build/trans_style.java:1353 +#: build/trans_style.java:1361 msgid "aerialway" msgstr "" @@ -19920,5 +20806,5 @@ #. #. color piste_easy -#: build/trans_style.java:1366 build/trans_style.java:1367 +#: build/trans_style.java:1371 build/trans_style.java:1372 msgid "piste_easy" msgstr "" @@ -19933,5 +20819,5 @@ #. #. color piste_intermediate -#: build/trans_style.java:1375 build/trans_style.java:1376 +#: build/trans_style.java:1380 build/trans_style.java:1381 msgid "piste_intermediate" msgstr "" @@ -19946,5 +20832,5 @@ #. #. color piste_advanced -#: build/trans_style.java:1384 build/trans_style.java:1385 +#: build/trans_style.java:1389 build/trans_style.java:1390 msgid "piste_advanced" msgstr "" @@ -19959,5 +20845,5 @@ #. #. color piste_expert -#: build/trans_style.java:1393 build/trans_style.java:1394 +#: build/trans_style.java:1398 build/trans_style.java:1399 msgid "piste_expert" msgstr "" @@ -19972,5 +20858,5 @@ #. #. color piste_freeride -#: build/trans_style.java:1402 build/trans_style.java:1403 +#: build/trans_style.java:1407 build/trans_style.java:1408 msgid "piste_freeride" msgstr "" @@ -19985,5 +20871,5 @@ #. #. color piste_novice -#: build/trans_style.java:1411 build/trans_style.java:1412 +#: build/trans_style.java:1416 build/trans_style.java:1417 msgid "piste_novice" msgstr "" @@ -20088,10 +20974,10 @@ #. #. -#: build/trans_style.java:1423 build/trans_style.java:1430 -#: build/trans_style.java:1439 build/trans_style.java:1447 -#: build/trans_style.java:1455 build/trans_style.java:1463 -#: build/trans_style.java:1471 build/trans_style.java:1479 -#: build/trans_style.java:1487 build/trans_style.java:1495 -#: build/trans_style.java:1503 build/trans_style.java:1511 +#: build/trans_style.java:1428 build/trans_style.java:1435 +#: build/trans_style.java:1444 build/trans_style.java:1452 +#: build/trans_style.java:1460 build/trans_style.java:1468 +#: build/trans_style.java:1476 build/trans_style.java:1484 +#: build/trans_style.java:1492 build/trans_style.java:1500 +#: build/trans_style.java:1508 build/trans_style.java:1516 msgid "power" msgstr "" @@ -20105,5 +20991,5 @@ #. #. color pier -#: build/trans_style.java:1552 build/trans_style.java:1553 +#: build/trans_style.java:1557 build/trans_style.java:1558 msgid "pier" msgstr "" @@ -20117,5 +21003,5 @@ #. #. -#: build/trans_style.java:1561 +#: build/trans_style.java:1566 msgid "pipeline" msgstr "" @@ -20243,12 +21129,12 @@ #. #. -#: build/trans_style.java:1644 build/trans_style.java:1652 -#: build/trans_style.java:1660 build/trans_style.java:1668 -#: build/trans_style.java:1676 build/trans_style.java:1684 -#: build/trans_style.java:1700 build/trans_style.java:1708 -#: build/trans_style.java:1716 build/trans_style.java:1724 -#: build/trans_style.java:1732 build/trans_style.java:1740 -#: build/trans_style.java:1748 build/trans_style.java:1756 -#: build/trans_style.java:1764 +#: build/trans_style.java:1649 build/trans_style.java:1657 +#: build/trans_style.java:1665 build/trans_style.java:1673 +#: build/trans_style.java:1681 build/trans_style.java:1689 +#: build/trans_style.java:1705 build/trans_style.java:1713 +#: build/trans_style.java:1721 build/trans_style.java:1729 +#: build/trans_style.java:1737 build/trans_style.java:1745 +#: build/trans_style.java:1753 build/trans_style.java:1761 +#: build/trans_style.java:1769 msgid "leisure" msgstr "" @@ -20262,5 +21148,5 @@ #. #. -#: build/trans_style.java:1692 +#: build/trans_style.java:1697 msgid "marina" msgstr "" @@ -20332,8 +21218,8 @@ #. #. -#: build/trans_style.java:1774 build/trans_style.java:1782 -#: build/trans_style.java:1790 build/trans_style.java:1798 -#: build/trans_style.java:1806 build/trans_style.java:1814 -#: build/trans_style.java:1822 build/trans_style.java:1830 +#: build/trans_style.java:1779 build/trans_style.java:1787 +#: build/trans_style.java:1795 build/trans_style.java:1803 +#: build/trans_style.java:1811 build/trans_style.java:1819 +#: build/trans_style.java:1827 build/trans_style.java:1835 msgid "amenity" msgstr "" @@ -20435,10 +21321,10 @@ #. #. -#: build/trans_style.java:1838 build/trans_style.java:1846 -#: build/trans_style.java:1854 build/trans_style.java:1862 -#: build/trans_style.java:1870 build/trans_style.java:1878 -#: build/trans_style.java:1886 build/trans_style.java:1894 -#: build/trans_style.java:1902 build/trans_style.java:1909 -#: build/trans_style.java:1918 build/trans_style.java:1926 +#: build/trans_style.java:1843 build/trans_style.java:1851 +#: build/trans_style.java:1859 build/trans_style.java:1867 +#: build/trans_style.java:1875 build/trans_style.java:1883 +#: build/trans_style.java:1891 build/trans_style.java:1899 +#: build/trans_style.java:1907 build/trans_style.java:1914 +#: build/trans_style.java:1923 build/trans_style.java:1931 msgid "amenity_traffic" msgstr "" @@ -20824,22 +21710,22 @@ #. #. -#: build/trans_style.java:1934 build/trans_style.java:1942 -#: build/trans_style.java:1950 build/trans_style.java:1958 -#: build/trans_style.java:1966 build/trans_style.java:1974 -#: build/trans_style.java:1982 build/trans_style.java:1990 -#: build/trans_style.java:2105 build/trans_style.java:2113 -#: build/trans_style.java:2120 build/trans_style.java:2129 -#: build/trans_style.java:2137 build/trans_style.java:2145 -#: build/trans_style.java:2153 build/trans_style.java:2161 -#: build/trans_style.java:2169 build/trans_style.java:2177 -#: build/trans_style.java:2240 build/trans_style.java:2248 -#: build/trans_style.java:2256 build/trans_style.java:2265 -#: build/trans_style.java:2273 build/trans_style.java:2280 -#: build/trans_style.java:2288 build/trans_style.java:2296 -#: build/trans_style.java:2304 build/trans_style.java:2312 -#: build/trans_style.java:2320 build/trans_style.java:2328 -#: build/trans_style.java:2336 build/trans_style.java:2344 -#: build/trans_style.java:2352 build/trans_style.java:2360 -#: build/trans_style.java:2369 build/trans_style.java:2377 +#: build/trans_style.java:1939 build/trans_style.java:1947 +#: build/trans_style.java:1955 build/trans_style.java:1963 +#: build/trans_style.java:1971 build/trans_style.java:1979 +#: build/trans_style.java:1987 build/trans_style.java:1995 +#: build/trans_style.java:2110 build/trans_style.java:2118 +#: build/trans_style.java:2125 build/trans_style.java:2134 +#: build/trans_style.java:2142 build/trans_style.java:2150 +#: build/trans_style.java:2158 build/trans_style.java:2166 +#: build/trans_style.java:2174 build/trans_style.java:2182 +#: build/trans_style.java:2245 build/trans_style.java:2253 +#: build/trans_style.java:2261 build/trans_style.java:2270 +#: build/trans_style.java:2278 build/trans_style.java:2285 +#: build/trans_style.java:2293 build/trans_style.java:2301 +#: build/trans_style.java:2309 build/trans_style.java:2317 +#: build/trans_style.java:2325 build/trans_style.java:2333 +#: build/trans_style.java:2341 build/trans_style.java:2349 +#: build/trans_style.java:2357 build/trans_style.java:2365 +#: build/trans_style.java:2374 build/trans_style.java:2382 msgid "amenity_light" msgstr "" @@ -20871,6 +21757,6 @@ #. #. -#: build/trans_style.java:1998 build/trans_style.java:2006 -#: build/trans_style.java:3257 +#: build/trans_style.java:2003 build/trans_style.java:2011 +#: build/trans_style.java:3262 msgid "light_water" msgstr "" @@ -20931,8 +21817,8 @@ #. #. -#: build/trans_style.java:2184 build/trans_style.java:2192 -#: build/trans_style.java:2200 build/trans_style.java:2209 -#: build/trans_style.java:2216 build/trans_style.java:2224 -#: build/trans_style.java:2232 +#: build/trans_style.java:2189 build/trans_style.java:2197 +#: build/trans_style.java:2205 build/trans_style.java:2214 +#: build/trans_style.java:2221 build/trans_style.java:2229 +#: build/trans_style.java:2237 msgid "health" msgstr "" @@ -21285,26 +22171,26 @@ #. #. -#: build/trans_style.java:2396 build/trans_style.java:2404 -#: build/trans_style.java:2412 build/trans_style.java:2420 -#: build/trans_style.java:2428 build/trans_style.java:2436 -#: build/trans_style.java:2444 build/trans_style.java:2452 -#: build/trans_style.java:2460 build/trans_style.java:2468 -#: build/trans_style.java:2476 build/trans_style.java:2484 -#: build/trans_style.java:2492 build/trans_style.java:2500 -#: build/trans_style.java:2508 build/trans_style.java:2516 -#: build/trans_style.java:2524 build/trans_style.java:2532 -#: build/trans_style.java:2540 build/trans_style.java:2548 -#: build/trans_style.java:2556 build/trans_style.java:2564 -#: build/trans_style.java:2572 build/trans_style.java:2580 -#: build/trans_style.java:2588 build/trans_style.java:2596 -#: build/trans_style.java:2604 build/trans_style.java:2612 -#: build/trans_style.java:2620 build/trans_style.java:2628 -#: build/trans_style.java:2636 build/trans_style.java:2644 -#: build/trans_style.java:2652 build/trans_style.java:2660 -#: build/trans_style.java:2668 build/trans_style.java:2676 -#: build/trans_style.java:2684 build/trans_style.java:2692 -#: build/trans_style.java:2700 build/trans_style.java:2708 -#: build/trans_style.java:2716 build/trans_style.java:2724 -#: build/trans_style.java:2733 +#: build/trans_style.java:2401 build/trans_style.java:2409 +#: build/trans_style.java:2417 build/trans_style.java:2425 +#: build/trans_style.java:2433 build/trans_style.java:2441 +#: build/trans_style.java:2449 build/trans_style.java:2457 +#: build/trans_style.java:2465 build/trans_style.java:2473 +#: build/trans_style.java:2481 build/trans_style.java:2489 +#: build/trans_style.java:2497 build/trans_style.java:2505 +#: build/trans_style.java:2513 build/trans_style.java:2521 +#: build/trans_style.java:2529 build/trans_style.java:2537 +#: build/trans_style.java:2545 build/trans_style.java:2553 +#: build/trans_style.java:2561 build/trans_style.java:2569 +#: build/trans_style.java:2577 build/trans_style.java:2585 +#: build/trans_style.java:2593 build/trans_style.java:2601 +#: build/trans_style.java:2609 build/trans_style.java:2617 +#: build/trans_style.java:2625 build/trans_style.java:2633 +#: build/trans_style.java:2641 build/trans_style.java:2649 +#: build/trans_style.java:2657 build/trans_style.java:2665 +#: build/trans_style.java:2673 build/trans_style.java:2681 +#: build/trans_style.java:2689 build/trans_style.java:2697 +#: build/trans_style.java:2705 build/trans_style.java:2713 +#: build/trans_style.java:2721 build/trans_style.java:2729 +#: build/trans_style.java:2738 msgid "shop" msgstr "" @@ -21376,8 +22262,8 @@ #. #. -#: build/trans_style.java:2743 build/trans_style.java:2751 -#: build/trans_style.java:2759 build/trans_style.java:2767 -#: build/trans_style.java:2775 build/trans_style.java:2783 -#: build/trans_style.java:2791 build/trans_style.java:2799 +#: build/trans_style.java:2748 build/trans_style.java:2756 +#: build/trans_style.java:2764 build/trans_style.java:2772 +#: build/trans_style.java:2780 build/trans_style.java:2788 +#: build/trans_style.java:2796 build/trans_style.java:2804 msgid "hotel" msgstr "" @@ -21527,9 +22413,9 @@ #. #. -#: build/trans_style.java:2807 build/trans_style.java:2815 -#: build/trans_style.java:2823 build/trans_style.java:2831 -#: build/trans_style.java:2839 build/trans_style.java:2847 -#: build/trans_style.java:2848 build/trans_style.java:2856 -#: build/trans_style.java:2872 build/trans_style.java:2943 +#: build/trans_style.java:2812 build/trans_style.java:2820 +#: build/trans_style.java:2828 build/trans_style.java:2836 +#: build/trans_style.java:2844 build/trans_style.java:2852 +#: build/trans_style.java:2853 build/trans_style.java:2861 +#: build/trans_style.java:2877 build/trans_style.java:2948 msgid "tourism" msgstr "" @@ -21601,8 +22487,8 @@ #. #. -#: build/trans_style.java:2953 build/trans_style.java:2961 -#: build/trans_style.java:2969 build/trans_style.java:2977 -#: build/trans_style.java:2985 build/trans_style.java:2993 -#: build/trans_style.java:3001 build/trans_style.java:3009 +#: build/trans_style.java:2958 build/trans_style.java:2966 +#: build/trans_style.java:2974 build/trans_style.java:2982 +#: build/trans_style.java:2990 build/trans_style.java:2998 +#: build/trans_style.java:3006 build/trans_style.java:3014 msgid "historic" msgstr "" @@ -21673,8 +22559,8 @@ #. #. -#: build/trans_style.java:3018 build/trans_style.java:3026 -#: build/trans_style.java:3034 build/trans_style.java:3042 -#: build/trans_style.java:3090 build/trans_style.java:3098 -#: build/trans_style.java:3196 build/trans_style.java:3204 +#: build/trans_style.java:3023 build/trans_style.java:3031 +#: build/trans_style.java:3039 build/trans_style.java:3047 +#: build/trans_style.java:3095 build/trans_style.java:3103 +#: build/trans_style.java:3201 build/trans_style.java:3209 msgid "green" msgstr "" @@ -21688,5 +22574,5 @@ #. #. -#: build/trans_style.java:3050 +#: build/trans_style.java:3055 msgid "quarry" msgstr "" @@ -21700,5 +22586,5 @@ #. #. -#: build/trans_style.java:3058 +#: build/trans_style.java:3063 msgid "landfill" msgstr "" @@ -21720,5 +22606,5 @@ #. #. -#: build/trans_style.java:3066 build/trans_style.java:3074 +#: build/trans_style.java:3071 build/trans_style.java:3079 msgid "basin" msgstr "" @@ -21732,5 +22618,5 @@ #. #. -#: build/trans_style.java:3082 +#: build/trans_style.java:3087 msgid "forest" msgstr "" @@ -21744,5 +22630,5 @@ #. #. -#: build/trans_style.java:3114 +#: build/trans_style.java:3119 msgid "farmyard" msgstr "" @@ -21765,5 +22651,5 @@ #. #. -#: build/trans_style.java:3123 build/trans_style.java:3131 +#: build/trans_style.java:3128 build/trans_style.java:3136 msgid "retail" msgstr "" @@ -21777,5 +22663,5 @@ #. #. -#: build/trans_style.java:3139 +#: build/trans_style.java:3144 msgid "industrial" msgstr "" @@ -21789,5 +22675,5 @@ #. #. -#: build/trans_style.java:3147 +#: build/trans_style.java:3152 msgid "brownfield" msgstr "" @@ -21801,5 +22687,5 @@ #. #. -#: build/trans_style.java:3155 +#: build/trans_style.java:3160 msgid "greenfield" msgstr "" @@ -21813,5 +22699,5 @@ #. #. -#: build/trans_style.java:3163 +#: build/trans_style.java:3168 msgid "railland" msgstr "" @@ -21868,7 +22754,7 @@ #. #. -#: build/trans_style.java:3180 build/trans_style.java:3215 -#: build/trans_style.java:3223 build/trans_style.java:3231 -#: build/trans_style.java:3239 build/trans_style.java:3247 +#: build/trans_style.java:3185 build/trans_style.java:3220 +#: build/trans_style.java:3228 build/trans_style.java:3236 +#: build/trans_style.java:3244 build/trans_style.java:3252 msgid "military" msgstr "" @@ -21882,5 +22768,5 @@ #. #. -#: build/trans_style.java:3188 +#: build/trans_style.java:3193 msgid "cemetery" msgstr "" @@ -21893,5 +22779,5 @@ #. #. -#: build/trans_style.java:3264 +#: build/trans_style.java:3269 msgid "peak" msgstr "" @@ -21906,5 +22792,5 @@ #. #. -#: build/trans_style.java:3273 +#: build/trans_style.java:3278 msgid "glacier" msgstr "" @@ -21918,5 +22804,5 @@ #. #. -#: build/trans_style.java:3281 +#: build/trans_style.java:3286 msgid "volcano" msgstr "" @@ -21971,8 +22857,8 @@ #. #. -#: build/trans_style.java:3289 build/trans_style.java:3290 -#: build/trans_style.java:3298 build/trans_style.java:3314 -#: build/trans_style.java:3387 build/trans_style.java:3395 -#: build/trans_style.java:3403 +#: build/trans_style.java:3294 build/trans_style.java:3295 +#: build/trans_style.java:3303 build/trans_style.java:3319 +#: build/trans_style.java:3392 build/trans_style.java:3400 +#: build/trans_style.java:3408 msgid "natural" msgstr "" @@ -21986,5 +22872,5 @@ #. #. -#: build/trans_style.java:3306 +#: build/trans_style.java:3311 msgid "scrub" msgstr "" @@ -21998,5 +22884,5 @@ #. #. -#: build/trans_style.java:3322 +#: build/trans_style.java:3327 msgid "heath" msgstr "" @@ -22010,5 +22896,5 @@ #. #. -#: build/trans_style.java:3330 +#: build/trans_style.java:3335 msgid "wood" msgstr "" @@ -22022,5 +22908,5 @@ #. #. -#: build/trans_style.java:3371 +#: build/trans_style.java:3376 msgid "mud" msgstr "" @@ -22034,5 +22920,5 @@ #. #. -#: build/trans_style.java:3379 +#: build/trans_style.java:3384 msgid "beach" msgstr "" @@ -22110,8 +22996,8 @@ #. #. -#: build/trans_style.java:3419 build/trans_style.java:3427 -#: build/trans_style.java:3435 build/trans_style.java:3443 -#: build/trans_style.java:3451 build/trans_style.java:3459 -#: build/trans_style.java:3467 build/trans_style.java:3475 +#: build/trans_style.java:3424 build/trans_style.java:3432 +#: build/trans_style.java:3440 build/trans_style.java:3448 +#: build/trans_style.java:3456 build/trans_style.java:3464 +#: build/trans_style.java:3472 build/trans_style.java:3480 msgid "route" msgstr "" @@ -22159,7 +23045,7 @@ #. #. -#: build/trans_style.java:3485 build/trans_style.java:3493 -#: build/trans_style.java:3501 build/trans_style.java:3509 -#: build/trans_style.java:3517 +#: build/trans_style.java:3490 build/trans_style.java:3498 +#: build/trans_style.java:3506 build/trans_style.java:3514 +#: build/trans_style.java:3522 msgid "boundary" msgstr "" @@ -22301,10 +23187,10 @@ #. #. -#: build/trans_style.java:3941 build/trans_style.java:3949 -#: build/trans_style.java:3957 build/trans_style.java:3965 -#: build/trans_style.java:3973 build/trans_style.java:3981 -#: build/trans_style.java:3989 build/trans_style.java:3997 -#: build/trans_style.java:4005 build/trans_style.java:4013 -#: build/trans_style.java:4021 build/trans_style.java:4029 +#: build/trans_style.java:3946 build/trans_style.java:3954 +#: build/trans_style.java:3962 build/trans_style.java:3970 +#: build/trans_style.java:3978 build/trans_style.java:3986 +#: build/trans_style.java:3994 build/trans_style.java:4002 +#: build/trans_style.java:4010 build/trans_style.java:4018 +#: build/trans_style.java:4026 build/trans_style.java:4034 msgid "place" msgstr "" @@ -22352,6 +23238,6 @@ #. #. -#: build/trans_style.java:4146 build/trans_style.java:4153 -#: build/trans_style.java:4160 build/trans_style.java:4167 +#: build/trans_style.java:4151 build/trans_style.java:4158 +#: build/trans_style.java:4165 build/trans_style.java:4172 msgid "address" msgstr "" @@ -22593,5 +23479,5 @@ #: build/trans_wms.java:6 msgid "Open Aerial Map" -msgstr "開啟航空圖" +msgstr "開放航空圖" #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& @@ -22648,67 +23534,106 @@ msgstr "" +#~ msgid "unnamed" +#~ msgstr "未命名的" + +#~ msgid "Failed to initialize API. Please try again later." +#~ msgstr "初始化 API 失敗。請稍後再試一次。" + +#~ msgid "API initialization failed" +#~ msgstr "API 初始化失敗" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？" + +#~ msgid "No data" +#~ msgstr "沒有資料" + +#~ msgid "Update failed" +#~ msgstr "更新失敗" + +#~ msgid "Apply partial resolutions" +#~ msgstr "套用部分解決方案" + +#~ msgid "Layers: {0}" +#~ msgstr "圖層：{0}" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "將目前表格列中的成員自這個關係中移除" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。" + +#~ msgid "Validate" +#~ msgstr "檢驗" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "檢驗目前的選擇區域或整個資料組合。" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "節點中有部分(幾乎)在直線裡" + #~ msgid "Data Layer" #~ msgstr "資料圖層" +#~ msgid "Change" +#~ msgstr "改變" + +#~ msgid "Rotate" +#~ msgstr "旋轉" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Conflicts: {0}" +#~ msgstr "衝突： {0}" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "標籤 (數值留空會刪除該標籤)" + +#~ msgid "Move Up" +#~ msgstr "上移" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "將所有目前選取的物件加入為成員" + +#~ msgid "Move Down" +#~ msgstr "下移" + #~ msgid "There were conflicts during import." #~ msgstr "匯入時有衝突項目。" -#~ msgid "Change" -#~ msgstr "改變" - -#~ msgid "Rotate" -#~ msgstr "旋轉" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "標籤 (數值留空會刪除該標籤)" +#~ msgid "Aborting..." +#~ msgstr "正在中止..." + +#~ msgid "linked" +#~ msgstr "已連結" + +#~ msgid "Occupied By" +#~ msgstr "被此佔據：" + +#~ msgid "Remove Selected" +#~ msgstr "移陳選取的" + +#~ msgid "Basic" +#~ msgstr "基本" + +#~ msgid "Add Selected" +#~ msgstr "加入選取的" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "關係編輯器：{0}" + +#~ msgid "Cannot connect to server." +#~ msgstr "不能連線至伺服器。" #~ msgid "Error parsing server response." #~ msgstr "解析伺服器回應時發生錯誤。" -#~ msgid "Cannot connect to server." -#~ msgstr "不能連線至伺服器。" - -#~ msgid "Tagging preset source" -#~ msgstr "標籤預設組合來源" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "加入新的標籤預設組合來源到清單。" - -#~ msgid "Tagging preset sources" -#~ msgstr "標籤預設組合來源" - -#~ msgid "image not loaded" -#~ msgstr "尚未載入圖片" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "節點中有部分(幾乎)在直線裡" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Import TCX File..." -#~ msgstr "匯入 TCX 檔案..." - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm." -#~ "openstreetmap.de/wiki/TaggingPresets 的說明。" +#~ msgid "Error when communicating with server." +#~ msgstr "與伺服器連線時發生錯誤。" #~ msgid "" @@ -22724,10 +23649,4 @@ #~ "請使用別種投影系統。\n" #~ "看到此訊息後請勿上傳任何資料。" - -#~ msgid "Conflicts: {0}" -#~ msgstr "衝突： {0}" - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "直接從 JOSM 載入 TCX 檔案。" #~ msgid "" @@ -22746,15 +23665,55 @@ #~ "看到此訊息後請勿上傳任何資料。" +#~ msgid "Tagging preset source" +#~ msgstr "標籤預設組合來源" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm." +#~ "openstreetmap.de/wiki/TaggingPresets 的說明。" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "加入新的標籤預設組合來源到清單。" + +#~ msgid "Tagging preset sources" +#~ msgstr "標籤預設組合來源" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (GNOME Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡" + +#~ msgid "Import TCX File..." +#~ msgstr "匯入 TCX 檔案..." + +#~ msgid "% of lat:" +#~ msgstr "% 緯度：" + #~ msgid "Overlap tiles" #~ msgstr "重疊拼貼" -#~ msgid "% of lat:" -#~ msgstr "% 緯度：" - #~ msgid "% of lon:" #~ msgstr "% 經度：" -#~ msgid "Error when communicating with server." -#~ msgstr "與伺服器連線時發生錯誤。" +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "直接從 JOSM 載入 TCX 檔案。" + +#~ msgid "image not loaded" +#~ msgstr "尚未載入圖片" #~ msgid "image loading..."